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 Sat, 16 Nov 2013 16:26:31 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/d362ba59
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d362ba59
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d362ba59

Branch: refs/heads/trunk
Commit: d362ba596698c3b873750253cb2e0d4776c9865e
Parents: f388c9d 917bc05
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Sat Nov 16 10:26:23 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Sat Nov 16 10:26:23 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                           |  1 +
 .../org/apache/cassandra/net/MessagingService.java    | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d362ba59/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 43c9285,b21e7a7..458d1ba
--- 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
+  * Recover from IOException in accept() thread (CASSANDRA-6349)
   * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338)
   * Fix trying to hint timed out counter writes (CASSANDRA-6322)
   * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d362ba59/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------


Mime
View raw message