Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d918b8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d918b8f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d918b8f Branch: refs/heads/cassandra-3.0 Commit: 5d918b8fc0b90771caef586ce3b268c10b0d645a Parents: 32d7616 5fe40a1 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Thu Sep 24 14:47:18 2015 -0700 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Thu Sep 24 14:47:18 2015 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++- .../org/apache/cassandra/service/StorageServiceMBean.java | 5 ++++- src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d918b8f/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 0a8717f,1527eb1..76299b7 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -1571,12 -1555,7 +1571,12 @@@ public class StorageService extends Not return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString(); } + public UUID getLocalHostUUID() + { + return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()); + } + - public Map<String, String> getHostIdMap() + public Map<String, String> getEndpointToHostId() { Map<String, String> mapOut = new HashMap<>(); for (Map.Entry<InetAddress, UUID> entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet()) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d918b8f/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d918b8f/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------