You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2016/11/29 17:24:11 UTC
[11/13] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
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/40043021
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40043021
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40043021
Branch: refs/heads/cassandra-3.X
Commit: 40043021ba80314d4d095363fc6fa4b2d14a8f7c
Parents: bf97b85 d5dbd0c
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Nov 29 17:15:13 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Nov 29 17:15:13 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 11 +++++------
src/java/org/apache/cassandra/dht/LocalPartitioner.java | 10 ++++++++--
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40043021/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 42d82d9,2cd0eb0..fb85765
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,13 @@@
+3.12
+ * Remove timing window in test case (CASSANDRA-12875)
+ * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)
+ * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
+ * 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)
- Merged from 2.2:
- * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+
3.10
+ * Fix inconsistencies in cassandra-stress load balancing policy (CASSANDRA-12919)
+ * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
* Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
* Fix Murmur3PartitionerTest (CASSANDRA-12858)
* Move cqlsh syntax rules into separate module and allow easier customization (CASSANDRA-12897)