You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/01/10 19:51:57 UTC
[8/8] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5e2a01a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5e2a01a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5e2a01a
Branch: refs/heads/trunk
Commit: b5e2a01af7ca1911d6779651fb647f9dc455f4e3
Parents: 892d8e6 c1c3d8f
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 10 12:49:56 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 10 12:49:56 2014 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 95 +++++++++++---------
.../service/LeaveAndBootstrapTest.java | 31 +++++++
2 files changed, 84 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5e2a01a/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5e2a01a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
----------------------------------------------------------------------