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/6990f95b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6990f95b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6990f95b
Branch: refs/heads/trunk
Commit: 6990f95b1dff4e4132ae43c037d0f117487ffb6e
Parents: b966e1a 01a57ee
Author: Jonathan Ellis
Authored: Mon Oct 7 14:20:48 2013 -0500
Committer: Jonathan Ellis
Committed: Mon Oct 7 14:20:48 2013 -0500
--
CHANGES.txt | 1 +
.../hadoop/pig/AbstractCassandraStorage.java| 30 +--
.../cassandra/hadoop/pig/CassandraStorage.java | 2 +-
.../apache/cassandra/hadoop/pig/CqlStorage.java | 7 +-
.../compress/CompressedRandomAccessReader.java | 5 ++
.../cassandra/io/util/RandomAccessReader.java | 2 +-
.../apache/cassandra/io/util/SegmentedFile.java | 3 +-
.../cassandra/service/FileCacheService.java | 87 ++--
8 files changed, 80 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6990f95b/CHANGES.txt
--
diff --cc CHANGES.txt
index 4ec387c,ddd976e..2e6e06a
--- 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 FileCacheService regressions (CASSANDRA-6149)
* Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
* Fix race conditions in bulk loader (CASSANDRA-6129)
* Add configurable metrics reporting (CASSANDRA-4430)