cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Date Thu, 26 Sep 2013 20:38:57 GMT
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 84f6c26aaf7cba286f8b98a02cf408fa5bb2131a
Parents: 246fefa 20c419b
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Sep 26 15:38:44 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Sep 26 15:38:44 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cassandra/service/AbstractReadExecutor.java | 338 ++++++++++++-------
 .../apache/cassandra/service/ReadCallback.java  |   2 +-
 .../apache/cassandra/service/StorageProxy.java  |  30 +-
 4 files changed, 226 insertions(+), 145 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84f6c26a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d2b1310,3d4d19c..d475170
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +2.1
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 +
 +
  2.0.2
+  * Fixes for speculative retry (CASSANDRA-5932)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/84f6c26a/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------


Mime
View raw message