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 Mon, 11 Nov 2013 17:41:29 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/e9c595b5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9c595b5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9c595b5

Branch: refs/heads/trunk
Commit: e9c595b5ef9af942eb76414f5a62df2907d3315f
Parents: d37696c 3af19c4
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Nov 11 11:41:25 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Nov 11 11:41:25 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                              | 1 +
 src/java/org/apache/cassandra/net/WriteCallbackInfo.java | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c595b5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6e1a91b,fa0b7cff..f78f1e8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 +2.1
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * 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)
 + * Remove CFDefinition (CASSANDRA-6253)
 + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
 + * User-defined types for CQL3 (CASSANDRA-5590)
 + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871)
 +
 +
  2.0.3
+  * Fix trying to hint timed out counter writes (CASSANDRA-6322)
   * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809)
   * Avoid flushing compaction_history after each operation (CASSANDRA-6287)
   * Fix repair assertion error when tombstones expire (CASSANDRA-6277)


Mime
View raw message