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/80355a10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/80355a10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/80355a10
Branch: refs/heads/trunk
Commit: 80355a105f5b7552b2ecd40939b83ff47d7eea56
Parents: 1f99e70 74bc1cc
Author: T Jake Luciani <[email protected]>
Authored: Thu Oct 1 09:12:36 2015 -0400
Committer: T Jake Luciani <[email protected]>
Committed: Thu Oct 1 09:12:36 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 7 ++++++-
.../org/apache/cassandra/service/StorageServiceMBean.java | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/80355a10/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 76299b7,d426cbc..9153cd8
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -405,10 -421,10 +405,10 @@@ public class StorageService extends Not
{
throw new IllegalStateException("No configured daemon");
}
-
+
try
{
- daemon.nativeServer.start();
+ daemon.startNativeTransport();
}
catch (Exception e)
{
@@@ -1571,11 -1555,11 +1571,16 @@@
return
getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString();
}
+ public UUID getLocalHostUUID()
+ {
+ return
getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress());
+ }
+
+ public Map<String, String> getHostIdMap()
+ {
+ return getEndpointToHostId();
+ }
+
public Map<String, String> getEndpointToHostId()
{
Map<String, String> mapOut = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/80355a10/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
