Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f03e505f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f03e505f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f03e505f Branch: refs/heads/trunk Commit: f03e505fdc439b5c52c2c4c000ae6e9f26e706a9 Parents: 4f48ea0 5571569 Author: Brandon Williams <[email protected]> Authored: Fri Jul 25 11:19:16 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Jul 25 11:19:16 2014 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/RecoveryManagerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
