Merge branch 'cassandra-2.2' into trunk
Conflicts:
test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a83407f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a83407f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a83407f8
Branch: refs/heads/trunk
Commit: a83407f8c31d1520700b993dc34171cd2d61ccd3
Parents: 4c12f19 c33ebcd
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Wed Jul 15 10:36:16 2015 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Wed Jul 15 10:36:16 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../locator/DynamicEndpointSnitch.java | 34 ++++++++--
.../locator/DynamicEndpointSnitchTest.java | 69 +++++++++++++++++++-
3 files changed, 95 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a83407f8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f484748,c2d06e4..5c60239
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,8 +1,27 @@@
+3.0
+ * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
+ * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
+ * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781)
+ * Update Guava to 18.0 (CASSANDRA-9653)
+ * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
+ * New option for cassandra-stress to leave a ratio of columns null
(CASSANDRA-9522)
+ * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
+ * Add algorithmic token allocation (CASSANDRA-7032)
+ * Add nodetool command to replay batchlog (CASSANDRA-9547)
+ * Make file buffer cache independent of paths being read (CASSANDRA-8897)
+ * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
+ * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
+ * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
+ * Change default garbage collector to G1 (CASSANDRA-7486)
+ * Populate TokenMetadata early during startup (CASSANDRA-9317)
+ * undeprecate cache recentHitRate (CASSANDRA-6591)
+ * Add support for selectively varint encoding fields (CASSANDRA-9499)
+
+
2.2.0-rc3
- * sum() and avg() functions missing for smallint and tinyint types
(CASSANDRA-9671)
* Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
Merged from 2.1:
+ * Complete CASSANDRA-8448 fix (CASSANDRA-9519)
* Handle corrupt files on startup (CASSANDRA-9686)
* Fix clientutil jar and tests (CASSANDRA-9760)
* (cqlsh) Allow the SSL protocol version to be specified through the
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a83407f8/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
index a928a30,64da6d3..e5f156f
--- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
@@@ -20,13 -21,13 +20,13 @@@ package org.apache.cassandra.locator
import java.io.IOException;
import java.net.InetAddress;
- import java.util.Arrays;
- import java.util.List;
+ import java.util.*;
+import org.junit.Test;
+
+ import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.service.StorageService;
-import org.junit.Test;
-
import org.apache.cassandra.utils.FBUtilities;
import static org.junit.Assert.assertEquals;
