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/09/19 17:22:58 UTC
[5/7] git commit: Merge branch 'cassandra-2.0' into trunk
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/636598d3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/636598d3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/636598d3
Branch: refs/heads/trunk
Commit: 636598d3424b9eb7aeb2166193d5793d40d44925
Parents: 2315686 fb7b71f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 10:22:01 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 10:22:01 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../cassandra/config/DatabaseDescriptor.java | 10 +++++
.../apache/cassandra/service/CacheService.java | 42 ++++++++++++++++----
.../cassandra/service/CacheServiceMBean.java | 6 +++
.../org/apache/cassandra/tools/NodeCmd.java | 8 +++-
.../org/apache/cassandra/tools/NodeProbe.java | 16 ++++++++
.../apache/cassandra/tools/NodeToolHelp.yaml | 3 ++
7 files changed, 78 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/636598d3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fe652f6,ae6eedc..942063e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,7 +1,15 @@@
+2.1
+ * 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
* Make ThriftServer more easlly extensible (CASSANDRA-6058)
+ Merged from 1.2:
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
2.0.1
http://git-wip-us.apache.org/repos/asf/cassandra/blob/636598d3/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------