You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/09/18 17:13:02 UTC
[1/3] git commit: rm dead code
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 ace937eb7 -> 74877bb6a
refs/heads/trunk 381ff18b2 -> b18478d05
rm dead code
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74877bb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74877bb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74877bb6
Branch: refs/heads/cassandra-2.1
Commit: 74877bb6aa26d6caa96ba9dd1954b7dac1c612e2
Parents: ace937e
Author: Brandon Williams <br...@apache.org>
Authored: Thu Sep 18 08:12:32 2014 +0000
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Sep 18 08:12:32 2014 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74877bb6/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 b1fe20e..7b92030 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3680,9 +3680,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
TokenMetadata metadata = tokenMetadata.cloneOnlyTokenMap();
- if (keyspace == null)
- keyspace = Schema.instance.getNonSystemKeyspaces().get(0);
-
Collection<Collection<InetAddress>> endpointsGroupedByDc = new ArrayList<>();
// mapping of dc's to nodes, use sorted map so that we get dcs sorted
SortedMap<String, Collection<InetAddress>> sortedDcsToEndpoints = new TreeMap<>();
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b18478d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b18478d0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b18478d0
Branch: refs/heads/trunk
Commit: b18478d05771d730ffaba0b236570b523e5a16e8
Parents: 381ff18 74877bb
Author: Brandon Williams <br...@apache.org>
Authored: Thu Sep 18 08:12:39 2014 +0000
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Sep 18 08:12:39 2014 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] git commit: rm dead code
Posted by br...@apache.org.
rm dead code
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74877bb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74877bb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74877bb6
Branch: refs/heads/trunk
Commit: 74877bb6aa26d6caa96ba9dd1954b7dac1c612e2
Parents: ace937e
Author: Brandon Williams <br...@apache.org>
Authored: Thu Sep 18 08:12:32 2014 +0000
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Sep 18 08:12:32 2014 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74877bb6/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 b1fe20e..7b92030 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3680,9 +3680,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
TokenMetadata metadata = tokenMetadata.cloneOnlyTokenMap();
- if (keyspace == null)
- keyspace = Schema.instance.getNonSystemKeyspaces().get(0);
-
Collection<Collection<InetAddress>> endpointsGroupedByDc = new ArrayList<>();
// mapping of dc's to nodes, use sorted map so that we get dcs sorted
SortedMap<String, Collection<InetAddress>> sortedDcsToEndpoints = new TreeMap<>();