Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b950c380 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b950c380 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b950c380 Branch: refs/heads/trunk Commit: b950c3801c00ae60a642b6d6f804145714ca63ec Parents: bcdbb0e 29ed6fe Author: Sam Tunnicliffe <s...@beobal.com> Authored: Wed Dec 2 13:17:37 2015 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Wed Dec 2 13:17:37 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/b950c380/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b950c380/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b950c380/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b950c380/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
