merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5817aa95 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5817aa95 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5817aa95 Branch: refs/heads/cassandra-2.0 Commit: 5817aa95c3ea076ee74dfa0c9a6369d9dcfd7cf0 Parents: 15aeb5c Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Sep 23 17:13:42 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Sep 23 17:13:42 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5817aa95/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b03d094..43bb25c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,9 +1,8 @@ 2.0.2 - * Move batchlog replay to its own executor (CASSANDRA-6079) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) * Fix insertion of collections with CAS (CASSANDRA-6069) Merged from 1.2: - * Improve memory usage of metadata min/max column names (CASSANDRA-6077) * Allow where clause conditions to be in parenthesis (CASSANDRA-6037) * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916) * Move batchlog replay to its own executor (CASSANDRA-6079)
