You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/19 23:54:33 UTC

[2/6] git commit: edit for 2.0.1 re-roll

edit for 2.0.1 re-roll


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

Branch: refs/heads/cassandra-2.0
Commit: 023b55f3b45722873737258820aefe47672af67e
Parents: 5a7cc11
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 16:49:35 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 16:50:17 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/023b55f3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 979d6b0..a6938f4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,12 +1,7 @@
-2.0.2
+2.0.1
  * Improve memory use defaults (CASSANDRA-5069)
  * Make ThriftServer more easlly extensible (CASSANDRA-6058)
  * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
-Merged from 1.2:
- * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
-
-
-2.0.1
  * add file_cache_size_in_mb setting (CASSANDRA-5661)
  * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
  * Improve leveled compaction's ability to find non-overlapping L0 compactions
@@ -36,6 +31,7 @@ Merged from 1.2:
  * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
  * Support named bind variables in CQL (CASSANDRA-6033)
 Merged from 1.2:
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
  * 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)