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/bc70e490 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc70e490 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc70e490 Branch: refs/heads/trunk Commit: bc70e49037b17298f9273da3ae23220209c3eeca Parents: 7e66827 afbc2e8 Author: Sam Tunnicliffe <[email protected]> Authored: Mon Dec 5 11:21:04 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Mon Dec 5 11:21:04 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/SystemKeyspace.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc70e490/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 14e45be,3d27690..f428e31 --- 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 + * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc70e490/src/java/org/apache/cassandra/db/SystemKeyspace.java ----------------------------------------------------------------------
