[4/9] cassandra git commit: Fix CHANGES entry for CASSANDRA-12868

[ms...@apache.org]

Fix CHANGES entry for CASSANDRA-12868


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

Branch: refs/heads/cassandra-3.X
Commit: 61368aee729cf39057561e5b3fea10c64c6448a8
Parents: 09da51e
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Mon Dec 5 13:18:25 2016 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Mon Dec 5 13:18:25 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/61368aee/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3918cfd..47b5e42 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,10 +5,6 @@
  * Add support for arithmetic operators (CASSANDRA-11935)
  * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 
-3.11
-Merged from 3.0:
- * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
-
 3.10
  * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
  * Remove timing window in test case (CASSANDRA-12875)
@@ -119,6 +115,7 @@ Merged from 3.0:
  * Restore resumable hints delivery (CASSANDRA-11960)
  * Properly report LWT contention (CASSANDRA-12626)
 Merged from 3.0:
+ * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
  * Nodetool should use a more sane max heap size (CASSANDRA-12739)
  * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
  * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)