Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33ceddaf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33ceddaf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33ceddaf Branch: refs/heads/trunk Commit: 33ceddafab48e7d3c216dc224bcd63d4b469f911 Parents: 3f1820f c6b509d Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Sep 5 08:14:29 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Sep 5 08:14:29 2014 -0500 ---------------------------------------------------------------------- test/conf/cassandra.yaml | 2 -- test/pig/org/apache/cassandra/pig/PigTestBase.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) ----------------------------------------------------------------------
