Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2133265
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2133265
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2133265
Branch: refs/heads/trunk
Commit: d21332655f6f6d0c59160dbedb92006b8d426743
Parents: 9a0ea53 4cc4acb
Author: Marcus Eriksson <[email protected]>
Authored: Mon Jun 30 16:14:14 2014 +0200
Committer: Marcus Eriksson <[email protected]>
Committed: Mon Jun 30 16:14:14 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2133265/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5711fc2,c2e5a00..c912094
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,10 -9,9 +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)
+ * Make sure high level sstables get compacted (CASSANDRA-7414)
+
2.1.0-rc2
* Fix heap size calculation for CompoundSparseCellName and
CompoundSparseCellName.WithCollection (CASSANDRA-7421)
