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 Tue, 27 Dec 2016 18:55:12 GMT
Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  More fixes to the TokenAllocation


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

Branch: refs/heads/trunk
Commit: 88b7126a177a77e28b34384e7792d4b4394cb55f
Parents: 55fe548 4aa09eb
Author: Dikang Gu <dikang85@gmail.com>
Authored: Tue Dec 27 10:51:58 2016 -0800
Committer: Dikang Gu <dikang85@gmail.com>
Committed: Tue Dec 27 10:53:05 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../dht/tokenallocator/TokenAllocation.java     | 30 ++++++++++++
 .../tokenallocator/TokenAllocatorFactory.java   |  2 +-
 src/java/org/apache/cassandra/gms/Gossiper.java | 45 ++++++++++++++++++
 .../cassandra/service/CassandraDaemon.java      | 48 +-------------------
 5 files changed, 78 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b7126a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b412f11,e9dc503..ba0e3f1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 +4.0
 + * Thrift removal (CASSANDRA-11115)
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * 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.12
+  * More fixes to the TokenAllocator (CASSANDRA-12990)
   * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510)
   * Allow IN restrictions on column families with collections (CASSANDRA-12654)
   * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b7126a/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b7126a/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------


Mime
View raw message