Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 f5bc42996 -> 12a09ec3f
  refs/heads/trunk 8ebef8e71 -> 0cb27a781


fixup CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12a09ec3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12a09ec3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12a09ec3

Branch: refs/heads/cassandra-3.11
Commit: 12a09ec3f2028fa8e9182e027afb8bf96613721a
Parents: f5bc429
Author: Marcus Eriksson <marc...@apache.org>
Authored: Wed Oct 4 08:24:47 2017 +0200
Committer: Marcus Eriksson <marc...@apache.org>
Committed: Wed Oct 4 08:24:47 2017 +0200

----------------------------------------------------------------------
 CHANGES.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/12a09ec3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4a22af4..e231bf2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+3.11.2
+Merged from 3.0:
+ * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
+
+
 3.11.1
  * Fix the computation of cdc_total_space_in_mb for exabyte filesystems 
(CASSANDRA-13808)
  * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is a 
single leaf and overflow collisions (CASSANDRA-13869)
@@ -12,7 +17,6 @@
  * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
  * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 Merged from 3.0:
- * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922)
  * Improve TRUNCATE performance (CASSANDRA-13909)
  * Implement short read protection on partition boundaries (CASSANDRA-13595)
  * Fix ISE thrown by UPI.Serializer.hasNext() for some SELECT queries 
(CASSANDRA-13911)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to