Merge branch 'cassandra-2.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/ec308e66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec308e66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec308e66 Branch: refs/heads/trunk Commit: ec308e66b34fc6946aa6c1c1b8967ba3aa963a74 Parents: 12c4734 b3647d9 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Oct 3 11:21:32 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Oct 3 11:21:32 2013 +0200 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec308e66/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java ----------------------------------------------------------------------
