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/b3a0130d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3a0130d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3a0130d Branch: refs/heads/trunk Commit: b3a0130d1d76af903c1e5bcc2b65a2ef120e3626 Parents: 17bd6ad e722046 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Oct 14 17:15:22 2016 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Oct 14 17:15:22 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3a0130d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0aef01c,5023590..63ed4a6 --- 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) + + 3.10 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes in CASSANDRA-10876 (CASSANDRA-12761) * cqlsh fails to format collections when using aliases (CASSANDRA-11534) * Check for hash conflicts in prepared statements (CASSANDRA-12733) * Exit query parsing upon first error (CASSANDRA-12598)
