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/e488e587 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e488e587 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e488e587 Branch: refs/heads/trunk Commit: e488e5879dce41518a217eb9de1978149b60867c Parents: b38a905 a169863 Author: Brandon Williams <[email protected]> Authored: Fri Jan 24 12:51:10 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Jan 24 12:51:10 2014 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/service/StorageService.java | 3 ++- .../cassandra/service/LeaveAndBootstrapTest.java | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e488e587/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e488e587/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java ----------------------------------------------------------------------
