Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56965fd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56965fd6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56965fd6 Branch: refs/heads/cassandra-3.0 Commit: 56965fd6ff94e79d0f00ae9eac2e9bda48c69129 Parents: c35af2a 432a8a4 Author: Robert Stupp <sn...@snazy.de> Authored: Fri Nov 27 13:53:20 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Nov 27 13:53:20 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 6 + src/java/org/apache/cassandra/gms/Gossiper.java | 28 +- .../locator/GossipingPropertyFileSnitch.java | 107 ++---- .../cassandra/locator/PropertyFileSnitch.java | 74 +++- .../cassandra/locator/SnitchProperties.java | 5 + .../cassandra/service/CassandraDaemon.java | 17 +- .../cassandra/service/MigrationManager.java | 4 +- .../apache/cassandra/service/StorageProxy.java | 8 +- .../cassandra/service/StorageService.java | 28 +- .../GossipingPropertyFileSnitchTest.java | 35 +- .../locator/PropertyFileSnitchTest.java | 334 +++++++++++++++++++ 12 files changed, 493 insertions(+), 154 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 97c0eae,ce82bd0..592cff8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -19,7 -7,16 +19,8 @@@ Merged from 2.2 * Fix SimpleDateType type compatibility (CASSANDRA-10027) * (Hadoop) fix splits calculation (CASSANDRA-10640) * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) - * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) - * Use most up-to-date version of schema for system tables (CASSANDRA-10652) - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) - * Expose phi values from failure detector via JMX and tweak debug - and trace logging (CASSANDRA-9526) - * Fix RangeNamesQueryPager (CASSANDRA-10509) - * Deprecate Pig support (CASSANDRA-10542) - * Reduce contention getting instances of CompositeType (CASSANDRA-10433) Merged from 2.1: + * Warn or fail when changing cluster topology live (CASSANDRA-10243) * Status command in debian/ubuntu init script doesn't work (CASSANDRA-10213) * Some DROP ... IF EXISTS incorrectly result in exceptions on non-existing KS (CASSANDRA-10658) * DeletionTime.compareTo wrong in rare cases (CASSANDRA-10749) http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/test/unit/org/apache/cassandra/locator/GossipingPropertyFileSnitchTest.java ----------------------------------------------------------------------
