fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4dc5d690 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dc5d690 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dc5d690 Branch: refs/heads/trunk Commit: 4dc5d690f1483ed8e112c0d7834af1e46b982b05 Parents: cb585ef Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Oct 18 00:22:10 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Oct 18 00:22:10 2013 -0500 ---------------------------------------------------------------------- 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/4dc5d690/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 4489f59..e4e03a2 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -402,7 +402,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE { throw new RuntimeException(e); } - SystemTable.setLocalHostId(hostId); // use the replacee's host Id as our own so we receive hints, etc + SystemKeyspace.setLocalHostId(hostId); // use the replacee's host Id as our own so we receive hints, etc MessagingService.instance().shutdown(); Gossiper.instance.resetEndpointStateMap(); // clean up since we have what we need return tokens;
