cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Mon, 23 Sep 2013 22:13:55 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: 15aeb5c81226738cf7eb372d26fc95a1370e1994
Parents: 52b4fc3 d014e4c
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Sep 23 17:13:25 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Sep 23 17:13:25 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15aeb5c8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index aef45ba,cecb88a..b03d094
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,8 +1,12 @@@
 -1.2.11
 - * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
 +2.0.2
 + * Move batchlog replay to its own executor (CASSANDRA-6079)
 + * 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)
-  * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+  * Move batchlog replay to its own executor (CASSANDRA-6079)
   * Add tombstone debug threshold and histogram (CASSANDRA-6042, 6057)
  
  


Mime
View raw message