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