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/10/01 21:21:02 UTC
[3/3] 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/ca697d59
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca697d59
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca697d59
Branch: refs/heads/trunk
Commit: ca697d591302ce6deff5138e2684b554d3127b04
Parents: c7ebc85 dc7221f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Oct 1 14:20:53 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Oct 1 14:20:53 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 8 +++++++
conf/cassandra.yaml | 15 +++++++++----
.../org/apache/cassandra/config/Config.java | 3 ++-
.../cassandra/config/DatabaseDescriptor.java | 22 +++++++++++++-------
.../apache/cassandra/db/ReadVerbHandler.java | 12 ++++++++++-
.../db/columniterator/IdentityQueryFilter.java | 6 ++++++
.../cassandra/db/filter/SliceQueryFilter.java | 16 ++++++++++++--
.../filter/TombstoneOverwhelmingException.java | 5 +++++
.../service/RangeSliceVerbHandler.java | 5 +++++
.../cassandra/service/StorageService.java | 18 ++++++++++++----
.../cassandra/service/StorageServiceMBean.java | 13 ++++++++----
12 files changed, 100 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca697d59/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 51f7fcf,9bd01ef..e22b6cf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
+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
+ * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
* Track and persist sstable read activity (CASSANDRA-5515)
* Fixes for speculative retry (CASSANDRA-5932)
* Improve memory usage of metadata min/max column names (CASSANDRA-6077)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca697d59/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca697d59/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca697d59/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca697d59/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------