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, 05 Oct 2013 00:42:42 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/b7460871
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7460871
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7460871

Branch: refs/heads/trunk
Commit: b7460871b96e86a1ff36359bd6a05b0d6016735e
Parents: a28b430 6529d73
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Oct 4 19:42:33 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Oct 4 19:42:33 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 src/java/org/apache/cassandra/streaming/StreamResultFuture.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7460871/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 867698b,6a7c3fe..00ebdce
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +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)
 +
 +
  2.0.2
+  * Fix race conditions in bulk loader (CASSANDRA-6129)
   * Add configurable metrics reporting (CASSANDRA-4430)
   * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
   * Track and persist sstable read activity (CASSANDRA-5515)


Mime
View raw message