Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f02335b2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f02335b2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f02335b2 Branch: refs/heads/trunk Commit: f02335b2a640cdcc0aba9b405317722cce0efa2e Parents: ad58bf7 06e742f Author: Josh McKenzie <[email protected]> Authored: Fri May 29 13:37:01 2015 -0400 Committer: Josh McKenzie <[email protected]> Committed: Fri May 29 13:37:01 2015 -0400 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
