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/2f8d9076 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f8d9076 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f8d9076 Branch: refs/heads/trunk Commit: 2f8d9076664c6253a3bfa173b9421cf0a37bdfe8 Parents: adadd77 68c828f Author: Stefania Alborghetti <[email protected]> Authored: Mon Nov 28 09:07:06 2016 +0800 Committer: Stefania Alborghetti <[email protected]> Committed: Mon Nov 28 09:07:06 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 47 ++++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f8d9076/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4ae0882,32a3f32..e5e160a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ +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.12 + * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946) * Add support for arithmetic operators (CASSANDRA-11935) 3.11
