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/5176ce71 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5176ce71 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5176ce71 Branch: refs/heads/trunk Commit: 5176ce71558946a210ff03c0c8f4b0af563e9942 Parents: 1202953 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Sep 23 09:31:42 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Sep 23 09:31:42 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5176ce71/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 39aebc8..bae83ca 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,7 @@ 2.0.2 * Move batchlog replay to its own executor (CASSANDRA-6079) - * Improve memory usage of metadata min/max column names (CASSANDRA-6077) 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) * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
