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 Fri, 21 Oct 2016 01:27:20 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/4d340329
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d340329
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d340329

Branch: refs/heads/trunk
Commit: 4d3403293477b6f9389a47da94cbbe975ce138d4
Parents: 4f8a1c8 e6d22da
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Fri Oct 21 09:24:35 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Fri Oct 21 09:24:35 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt                                              | 1 +
 src/java/org/apache/cassandra/dht/RandomPartitioner.java | 2 +-
 src/java/org/apache/cassandra/utils/GuidGenerator.java   | 9 ++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d340329/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 94a1a4e,8a0e169..e63b23b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,8 +1,15 @@@
 +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 RandomReplicationAwareTokenAllocatorTest.testExistingCluster (CASSANDRA-12812)
   * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 - * Make the fanout size for LeveledCompactionStrategy to be configurable (CASSANDRA-11550)
   * Add duration data type (CASSANDRA-11873)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable (CASSANDRA-11550)
   * 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)


Mime
View raw message