Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5F63610D55 for ; Fri, 18 Oct 2013 14:10:19 +0000 (UTC) Received: (qmail 47074 invoked by uid 500); 18 Oct 2013 14:10:18 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 46372 invoked by uid 500); 18 Oct 2013 14:10:12 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 46362 invoked by uid 99); 18 Oct 2013 14:10:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Oct 2013 14:10:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 338DD3632F; Fri, 18 Oct 2013 14:10:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: really fix build this time Date: Fri, 18 Oct 2013 14:10:10 +0000 (UTC) Updated Branches: refs/heads/cassandra-2.0 4dc5d690f -> 91bd207ff really fix build this time Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91bd207f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91bd207f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91bd207f Branch: refs/heads/cassandra-2.0 Commit: 91bd207ffb3bb8fb1071488a372f65ea168cf222 Parents: 4dc5d69 Author: Marcus Eriksson Authored: Fri Oct 18 16:08:20 2013 +0200 Committer: Marcus Eriksson Committed: Fri Oct 18 16:08:20 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/91bd207f/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 e4e03a2..b158a81 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -585,7 +585,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()));