Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b4cce86
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b4cce86
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b4cce86
Branch: refs/heads/trunk
Commit: 0b4cce86a222c4e9d9a0b32567ab16da519d87d3
Parents: d182fa1 c0f159b
Author: Marcus Eriksson <[email protected]>
Authored: Tue Mar 17 11:14:53 2015 +0100
Committer: Marcus Eriksson <[email protected]>
Committed: Tue Mar 17 11:14:53 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/compaction/LeveledManifest.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b4cce86/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ef2a7c7,7b8e0ad..be57f1b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -113,7 -44,7 +113,8 @@@
* Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
* Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
Merged from 2.0:
+2.0.14:
+ * Improve compaction estimated tasks estimation (CASSANDRA-8904)
* Fix duplicate up/down messages sent to native clients (CASSANDRA-7816)
* Expose commit log archive status via JMX (CASSANDRA-8734)
* Provide better exceptions for invalid replication strategy parameters
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b4cce86/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------
