[04/10] git commit: CHANGES

[jb...@apache.org]

CHANGES


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27227b02
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27227b02
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27227b02

Branch: refs/heads/cassandra-2.0
Commit: 27227b02e646a8b4a3e37a156e2a89f7f8d1bfe6
Parents: 5dc5086
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 23 09:25:17 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 23 09:31:06 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/27227b02/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0403381..a33c688 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,9 @@
 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:
+ * Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
+ * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
 
 
 2.0.1
@@ -38,11 +41,6 @@
  * Support named bind variables in CQL (CASSANDRA-6033)
 Merged from 1.2:
  * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
- * Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
- * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
-
-
-1.2.10
  * Avoid second-guessing out-of-space state (CASSANDRA-5605)
  * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
  * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)