Merge branch 'cassandra-3.0' into cassandra-3.11

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d17836de
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d17836de
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d17836de

Branch: refs/heads/cassandra-3.11
Commit: d17836dec7ed9bd1aebb7ad9f369c7ab26317e31
Parents: af600c7 a270ee7
Author: Marcus Eriksson <marc...@apache.org>
Authored: Mon Nov 12 09:46:03 2018 +0100
Committer: Marcus Eriksson <marc...@apache.org>
Committed: Mon Nov 12 09:46:03 2018 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 .../cassandra/db/compaction/TimeWindowCompactionStrategy.java      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d17836de/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f923fa0,d9eb316..e07099a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.18
 +3.11.4
 +Merged from 3.0:
+  * Move TWCS message 'No compaction necessary for bucket size' to Trace level 
(CASSANDRA-14884)
   * Sstable min/max metadata can cause data loss (CASSANDRA-14861)
   * Dropped columns can cause reverse sstable iteration to return prematurely 
(CASSANDRA-14838)
   * Legacy sstables with  multi block range tombstones create invalid bound 
sequences (CASSANDRA-14823)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d17836de/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to