You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/08/01 08:52:28 UTC
[15/15] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6430c8b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6430c8b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6430c8b
Branch: refs/heads/trunk
Commit: a6430c8ba2c05569b941b27323156d30dd1d55e6
Parents: 4ad3353 a98552e
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Aug 1 10:46:15 2016 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Aug 1 10:46:15 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/compaction/LeveledCompactionTask.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6430c8b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 80063c8,e7d9066..36a21e6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -43,7 -19,9 +43,8 @@@ Merged from 2.2
* Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
Merged from 2.1:
* cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
+ * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
-
3.8
* Fix hdr logging for single operation workloads (CASSANDRA-12145)
* Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)