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/25653baa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25653baa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25653baa Branch: refs/heads/cassandra-3.X Commit: 25653baab7a543ad78b2f6a5495f2f39859aeaf3 Parents: 6854191 12c63cf Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Thu Nov 24 08:58:15 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Thu Nov 24 08:58:15 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/stress/util/JavaDriverClient.java | 33 +++++++++++--------- 2 files changed, 20 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25653baa/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b1fd83f,9be3e7c..3f47bab --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ +3.12 + * Add support for arithmetic operators (CASSANDRA-11935) + 3.11 + * Fix inconsistencies in cassandra-stress load balancing policy (CASSANDRA-12919) * Fix validation of non-frozen UDT cells (CASSANDRA-12916) * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
