Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be51176d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be51176d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be51176d Branch: refs/heads/trunk Commit: be51176d4ed71f63745d2f358347ffa42ddf0531 Parents: e92a4b6 5241160 Author: Joshua McKenzie <[email protected]> Authored: Tue Aug 18 11:56:05 2015 -0400 Committer: Joshua McKenzie <[email protected]> Committed: Tue Aug 18 11:56:05 2015 -0400 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------
