Merge branch 'cassandra-3.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/5bb80362 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5bb80362 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5bb80362 Branch: refs/heads/trunk Commit: 5bb80362d2d0533884f5a3af8892e6ff62d0bfff Parents: 721eaf6 ab96220 Author: Jonathan Ellis <[email protected]> Authored: Fri Sep 4 09:18:14 2015 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Sep 4 09:18:14 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/5bb80362/CHANGES.txt ----------------------------------------------------------------------
