You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2013/10/18 16:10:33 UTC
[1/2] git commit: really fix build this time
Updated Branches:
refs/heads/trunk 6bcf28edc -> 3f8a90aa4
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/trunk
Commit: 91bd207ffb3bb8fb1071488a372f65ea168cf222
Parents: 4dc5d69
Author: Marcus Eriksson <ma...@spotify.com>
Authored: Fri Oct 18 16:08:20 2013 +0200
Committer: Marcus Eriksson <ma...@spotify.com>
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()));
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f8a90aa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f8a90aa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f8a90aa
Branch: refs/heads/trunk
Commit: 3f8a90aa41709eb9070002a9b2e8ebd2306c4d26
Parents: 6bcf28e 91bd207
Author: Marcus Eriksson <ma...@spotify.com>
Authored: Fri Oct 18 16:08:25 2013 +0200
Committer: Marcus Eriksson <ma...@spotify.com>
Committed: Fri Oct 18 16:08:25 2013 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------