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/08/12 04:33:33 UTC
[5/6] git commit: merge from 2.0.0
merge from 2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1485758e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1485758e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1485758e
Branch: refs/heads/cassandra-2.0
Commit: 1485758eccdf5b603f5f38bca33276f3497247d4
Parents: 27ccae8 9a28df0
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Aug 11 21:33:13 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Aug 11 21:33:13 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
NEWS.txt | 3 +++
conf/cassandra.yaml | 21 +++++++--------------
3 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1485758e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1b4f7fe,5bc2745..51c6300
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
+2.0.1
+ * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
+ * Log Merkle tree stats (CASSANDRA-2698)
+ * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
+
+
- 2.0.0
+ 2.0.0-rc2
+ * enable vnodes by default (CASSANDRA-5869)
* fix CAS contention timeout (CASSANDRA-5830)
* fix HsHa to respect max frame size (CASSANDRA-4573)
Merged from 1.2: