Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab962202 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab962202 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab962202 Branch: refs/heads/trunk Commit: ab962202ae4b1f127441dcf8e733b8d2d73ddf7e Parents: c7557bd 25373e9 Author: Jonathan Ellis <[email protected]> Authored: Fri Sep 4 09:18:04 2015 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Sep 4 09:18:04 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/service/StorageService.java | 2 ++ src/java/org/apache/cassandra/tools/nodetool/Decommission.java | 3 +++ 3 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab962202/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab962202/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
