Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb577447 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb577447 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb577447 Branch: refs/heads/trunk Commit: fb577447bc9604dbba2a9cd83263d7c6306c0810 Parents: a9deba2 9366fb3 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Nov 21 20:17:53 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Nov 21 20:17:53 2012 +0100 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 2 -- .../apache/cassandra/db/RecoveryManager2Test.java | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
