fix CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b57695c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b57695c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b57695c Branch: refs/heads/cassandra-2.1.0 Commit: 4b57695ce0cb2094c194a22e5618b68ed5785516 Parents: 9415bb4 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Aug 4 12:08:42 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Aug 4 12:08:42 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 5 ----- 1 file changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b57695c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 48140fd..5033722 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -112,11 +112,6 @@ Merged from 2.0: * Backport CASSANDRA-6747 (CASSANDRA-7560) * Track max/min timestamps for range tombstones (CASSANDRA-7647) * Fix NPE when listing saved caches dir (CASSANDRA-7632) -Merged from 1.2: - * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668) - * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663) - * Set correct stream ID on responses when non-Exception Throwables - are thrown while handling native protocol messages (CASSANDRA-7470) 2.0.9
