cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Tue, 18 Oct 2016 01:14:40 GMT
Merge branch 'cassandra-3.X' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4705c28
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4705c28
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4705c28

Branch: refs/heads/trunk
Commit: a4705c28b70a3959ef1dd241501f9c0fe2d8f906
Parents: f2a3547 c6ec31b
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Tue Oct 18 09:10:05 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Tue Oct 18 09:10:05 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../apache/cassandra/dht/RandomPartitioner.java |   2 +-
 .../apache/cassandra/utils/GuidGenerator.java   |   5 +-
 ...tractReplicationAwareTokenAllocatorTest.java | 716 ++++++++++++++++++
 ...rmur3ReplicationAwareTokenAllocatorTest.java |  48 ++
 ...andomReplicationAwareTokenAllocatorTest.java |  54 ++
 .../ReplicationAwareTokenAllocatorTest.java     | 755 -------------------
 test/unit/org/apache/cassandra/Util.java        |  20 +-
 8 files changed, 835 insertions(+), 766 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4705c28/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c7b3206,32a2dfd..8f112ed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
 +
  3.10
+  * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
   * Improve sum aggregate functions (CASSANDRA-12417)
   * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes in CASSANDRA-10876
(CASSANDRA-12761)
   * cqlsh fails to format collections when using aliases (CASSANDRA-11534)


Mime
View raw message