You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by di...@apache.org on 2016/12/03 02:10:48 UTC
[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Merge branch 'cassandra-3.X' into trunk
* cassandra-3.X:
NoReplicationTokenAllocator should support zero replication factor
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04687c3a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04687c3a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04687c3a
Branch: refs/heads/trunk
Commit: 04687c3a3644cd1315f3d2dd97dfa2da4fdcdf18
Parents: ee7f3c3 0e35799
Author: Dikang Gu <di...@gmail.com>
Authored: Fri Dec 2 18:07:22 2016 -0800
Committer: Dikang Gu <di...@gmail.com>
Committed: Fri Dec 2 18:08:48 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../dht/tokenallocator/TokenAllocatorFactory.java | 10 +++++++++-
.../tokenallocator/NoReplicationTokenAllocatorTest.java | 9 +++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/04687c3a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index da9b27d,0f607db..3ef0e50
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
+4.0
+ * 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
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
* cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
* Add support for arithmetic operators (CASSANDRA-11935)