Updated Branches: refs/heads/trunk 3bd353f91 -> f49ca707d
Merge branch 'cassandra-1.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/f49ca707 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f49ca707 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f49ca707 Branch: refs/heads/trunk Commit: f49ca707d495bd78b94d36bc2df165649b4a5815 Parents: 3bd353f fb57744 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Nov 21 20:18:08 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Nov 21 20:18:08 2012 +0100 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 2 -- .../apache/cassandra/db/RecoveryManager2Test.java | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
