cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dik...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Mon, 14 Nov 2016 21:52:26 GMT
Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  Add the range limit for the split ratio in PartitionerTestCase.


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

Branch: refs/heads/trunk
Commit: 394a474536506a8676968c7fc217f364fd07fd62
Parents: 9b02ce9 4fd05e5
Author: Dikang Gu <dikang85@gmail.com>
Authored: Mon Nov 14 13:05:47 2016 -0800
Committer: Dikang Gu <dikang85@gmail.com>
Committed: Mon Nov 14 13:10:56 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                      |  9 +++------
 .../dht/ByteOrderedPartitionerTest.java          |  5 +++++
 .../cassandra/dht/Murmur3PartitionerTest.java    |  5 +++++
 .../dht/OrderPreservingPartitionerTest.java      |  5 +++++
 .../cassandra/dht/PartitionerTestCase.java       | 19 +++++++++++++++----
 .../cassandra/dht/RandomPartitionerTest.java     |  5 +++++
 6 files changed, 38 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/394a4745/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6c81d20,78d6325..06b3a98
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,14 @@@
 +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.11
-  * Move cqlsh syntax rules into separate module and allow easier customization (CASSANDRA-12897)
- Merged from 3.0:
-  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
- 
- 
  3.10
+  * Fix Murmur3PartitionerTest (CASSANDRA-12858)
+  * Move cqlsh syntax rules into separate module and allow easier customization (CASSANDRA-12897)
   * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
   * Fix cassandra-stress truncate option (CASSANDRA-12695)
   * Fix crossNode value when receiving messages (CASSANDRA-12791)
@@@ -113,8 -101,9 +109,9 @@@
   * Remove pre-startup check for open JMX port (CASSANDRA-12074)
   * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
   * Restore resumable hints delivery (CASSANDRA-11960)
 - * Properly report LWT contention (CASSANDRA-12626)
 + * Properly record CAS contention (CASSANDRA-12626)
  Merged from 3.0:
+  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
   * Pass root cause to CorruptBlockException when uncompression failed (CASSANDRA-12889)
   * Batch with multiple conditional updates for the same partition causes AssertionError
(CASSANDRA-12867)
   * Make AbstractReplicationStrategy extendable from outside its package (CASSANDRA-12788)


Mime
View raw message