Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d31ce663 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d31ce663 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d31ce663 Branch: refs/heads/trunk Commit: d31ce663f61de4e246ac95492d6846f6ace6a4ff Parents: bc70e49 caa26e4 Author: Carl Yeksigian <c...@apache.org> Authored: Mon Dec 5 11:47:03 2016 -0500 Committer: Carl Yeksigian <c...@apache.org> Committed: Mon Dec 5 11:47:03 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d31ce663/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d31ce663/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
