Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84b2e73c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84b2e73c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84b2e73c Branch: refs/heads/trunk Commit: 84b2e73c65287a099c4b21884cb12c82fa5568a9 Parents: 4901e4b 4626b4c Author: Stefania Alborghetti <[email protected]> Authored: Mon Dec 12 10:36:22 2016 +0800 Committer: Stefania Alborghetti <[email protected]> Committed: Mon Dec 12 10:36:22 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/gms/Gossiper.java | 1 + .../cassandra/service/StorageService.java | 26 +++++++++++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b2e73c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b2e73c/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
