Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38eaf7f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38eaf7f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38eaf7f1 Branch: refs/heads/trunk Commit: 38eaf7f1077b324630bb7d180872f709b0ee9de2 Parents: ac60e7d b950c38 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Wed Dec 2 13:19:39 2015 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Wed Dec 2 13:19:39 2015 +0000 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 21 +++++++++++++++----- .../cassandra/locator/PropertyFileSnitch.java | 7 ++----- .../cassandra/service/MigrationManager.java | 4 ++-- .../apache/cassandra/service/StorageProxy.java | 8 ++++---- .../cassandra/service/StorageService.java | 12 +++++------ 5 files changed, 30 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
