You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/11/21 21:17:29 UTC
[6/6] git commit: merge from 2.0
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3016e638
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3016e638
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3016e638
Branch: refs/heads/trunk
Commit: 3016e638106b1ff5f256dfecc9672585957f192a
Parents: e239ea6 0d8ea04
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Nov 21 14:17:19 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Nov 21 14:17:19 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 5 +++++
debian/changelog | 6 ++++++
src/java/org/apache/cassandra/cli/CliClient.java | 16 +++++++++-------
src/java/org/apache/cassandra/tools/NodeCmd.java | 5 -----
4 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3016e638/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a67f521,8cc61ad..e220d78
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,7 +1,21 @@@
+2.1
+ * Removed multithreaded compaction (CASSANDRA-6142)
+ * 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.4
+ * remove RF from nodetool ring output (CASSANDRA-6289)
+
+
2.0.3
* Fix FD leak on slice read path (CASSANDRA-6275)
* Cancel read meter task when closing SSTR (CASSANDRA-6358)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3016e638/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3016e638/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------