You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2014/06/30 15:45:23 UTC
[5/8] git commit: Merge CHANGES.txt from 2.1.0
Merge CHANGES.txt from 2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/230053fd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/230053fd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/230053fd
Branch: refs/heads/trunk
Commit: 230053fd55a22cdc653147716460be41510caf95
Parents: e77ea12 82aca6d
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Jun 30 14:44:03 2014 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Jun 30 14:44:03 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/230053fd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6aa2e6a,6464cd8..f94f1a8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,9 -9,8 +15,10 @@@ Merged from 2.0
operations to incorrect become full QUORUM (CASSANDRA-7345)
* Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
* (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
+ * Make sure high level sstables get compacted (CASSANDRA-7414)
+ * Commit disk failure policy (CASSANDRA-7429)
+
2.1.0-rc2
* Fix heap size calculation for CompoundSparseCellName and
CompoundSparseCellName.WithCollection (CASSANDRA-7421)