Merge branch 'cassandra-3.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/b53260d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b53260d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b53260d3 Branch: refs/heads/trunk Commit: b53260d30691dbaf25098db6f3d2837ba1a0f9f9 Parents: 48815d4 ce39f81 Author: Sylvain Lebresne <[email protected]> Authored: Wed Feb 17 11:30:58 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Feb 17 11:30:58 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/Schema.java | 28 ++++++++++++++++++-- .../locator/AbstractReplicationStrategy.java | 5 ++++ .../locator/NetworkTopologyStrategy.java | 6 +++++ .../cassandra/service/StorageService.java | 22 ++++++++------- 5 files changed, 51 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b53260d3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b53260d3/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java index f0342d4,7c8d95e..756b689 --- a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java +++ b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java @@@ -223,4 -192,16 +223,10 @@@ public class NetworkTopologyStrategy ex validateReplicationFactor(e.getValue()); } } + - public Collection<String> recognizedOptions() - { - // We explicitely allow all options - return null; - } - + @Override + public boolean hasSameSettings(AbstractReplicationStrategy other) + { + return super.hasSameSettings(other) && ((NetworkTopologyStrategy) other).datacenters.equals(datacenters); + } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b53260d3/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
