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/16490a48 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16490a48 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16490a48 Branch: refs/heads/trunk Commit: 16490a48b02b6f206a78717e9b816983f0b76bb1 Parents: 9fe436e 5788155 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Mon Nov 14 14:25:12 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Mon Nov 14 14:25:12 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 234 +------------------------- pylib/cqlshlib/cqlshhandling.py | 310 +++++++++++++++++++++++++++++++++++ 3 files changed, 315 insertions(+), 230 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/16490a48/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ea757f6,a8ef42c..6c81d20 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ +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)
