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/231a9370 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/231a9370 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/231a9370 Branch: refs/heads/trunk Commit: 231a9370619c86a0661ee421572750ea0ab197bf Parents: dffe270 c7fb95c Author: Aleksey Yeschenko <[email protected]> Authored: Tue Oct 11 14:33:55 2016 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Oct 11 14:33:55 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/QueryProcessor.java | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/231a9370/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 1310795,5907c74..7f5b7cb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +4.0 + * 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 + * Check for hash conflicts in prepared statements (CASSANDRA-12733) * Exit query parsing upon first error (CASSANDRA-12598) * Fix cassandra-stress to use single seed in UUID generation (CASSANDRA-12729) * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
