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/b207f2e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b207f2e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b207f2e3 Branch: refs/heads/trunk Commit: b207f2e3bf66bd3eeda87d42bb85e78c70604189 Parents: a85b007 Author: Michael Shuler <mich...@pbandjelly.org> Authored: Mon Dec 5 13:17:10 2016 -0600 Committer: Michael Shuler <mich...@pbandjelly.org> Committed: Mon Dec 5 13:17:10 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b207f2e3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c04c2fa..c5d2da2 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,3 @@ -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) @@ -112,6 +108,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)
