Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04e5f5d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04e5f5d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04e5f5d9 Branch: refs/heads/trunk Commit: 04e5f5d962fdebcf48f2a69f07e3612c653f908a Parents: 244ba19 38eaf7f Author: Sam Tunnicliffe <[email protected]> Authored: Wed Dec 2 13:20:50 2015 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Wed Dec 2 13:20:50 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04e5f5d9/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
