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/f987e361 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f987e361 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f987e361 Branch: refs/heads/trunk Commit: f987e361eae6a17234ddae74f189edcb6f03dd29 Parents: d1f1b8e ba08eb3 Author: Jonathan Ellis <[email protected]> Authored: Mon May 19 22:46:47 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon May 19 22:46:47 2014 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
