Updated Branches: refs/heads/trunk a9d64ef86 -> 6bcf28edc
fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bcf28ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bcf28ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bcf28ed Branch: refs/heads/trunk Commit: 6bcf28edcb1d59253113102efd7ac25ffb35037f Parents: a9d64ef Author: Marcus Eriksson <[email protected]> Authored: Fri Oct 18 15:28:21 2013 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Fri Oct 18 15:28:21 2013 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bcf28ed/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index cd09083..22a9270 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -582,7 +582,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE // for bootstrap to get the load info it needs. // (we won't be part of the storage ring though until we add a counterId to our state, below.) // Seed the host ID-to-endpoint map with our own ID. - getTokenMetadata().updateHostId(SystemTable.getLocalHostId(), FBUtilities.getBroadcastAddress()); + getTokenMetadata().updateHostId(SystemKeyspace.getLocalHostId(), FBUtilities.getBroadcastAddress()); appStates.put(ApplicationState.NET_VERSION, valueFactory.networkVersion()); appStates.put(ApplicationState.HOST_ID, valueFactory.hostId(SystemKeyspace.getLocalHostId())); appStates.put(ApplicationState.RPC_ADDRESS, valueFactory.rpcaddress(DatabaseDescriptor.getRpcAddress()));
