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/59842553 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59842553 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59842553 Branch: refs/heads/trunk Commit: 59842553e0cab6678605a2d9ba539532d6e0a8e2 Parents: 8d97e3d Author: Michael Shuler <[email protected]> Authored: Mon Dec 5 13:19:21 2016 -0600 Committer: Michael Shuler <[email protected]> Committed: Mon Dec 5 13:19:21 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59842553/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4952864..90003ec 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -14,10 +14,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) @@ -128,6 +124,7 @@ Merged from 3.0: * Restore resumable hints delivery (CASSANDRA-11960) * Properly record CAS 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)
