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:05 UTC
[05/13] cassandra git commit: Fix CHANGES.txt
Fix CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cbcd130
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cbcd130
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cbcd130
Branch: refs/heads/cassandra-3.X
Commit: 0cbcd1301fb5973d70ab8698e7d448c8f41c3414
Parents: 2b65b0d
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Nov 29 16:59:55 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Nov 29 16:59:55 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cbcd130/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 080de28..cee49bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,7 @@
-3.11
+3.10
* 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
* 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)
@@ -157,6 +153,7 @@ Merged from 3.0:
* Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
* Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
Merged from 2.2:
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
* Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
* Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
* Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)