Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/256da638 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/256da638 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/256da638 Branch: refs/heads/trunk Commit: 256da638594d84010a1cb5131db0c05cfce2d1eb Parents: ac3afd3 03e3d15 Author: Jonathan Ellis <[email protected]> Authored: Wed Nov 20 20:57:54 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Wed Nov 20 20:57:54 2013 -0600 ---------------------------------------------------------------------- .../cassandra/db/ColumnFamilyStoreTest.java | 56 +++++++------------- 1 file changed, 20 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
