Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ff97fec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ff97fec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ff97fec Branch: refs/heads/trunk Commit: 2ff97fec30023b8eb45d9ade82fc6a659486f1c6 Parents: 0475922 f00e431 Author: Branimir Lambov <branimir.lam...@datastax.com> Authored: Wed Nov 30 14:46:39 2016 +0200 Committer: Branimir Lambov <branimir.lam...@datastax.com> Committed: Wed Nov 30 14:47:22 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/restrictions/StatementRestrictions.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ff97fec/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 47b7c2a,b238018..64ed71c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ +3.12 + * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946) + * Add support for arithmetic operators (CASSANDRA-11935) + + 3.10 + * Use correct bounds for all-data range when filtering (CASSANDRA-12666) * Remove timing window in test case (CASSANDRA-12875) * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945) * Fix inconsistencies in cassandra-stress load balancing policy (CASSANDRA-12919)
