This is an automated email from the ASF dual-hosted git repository. marcuse pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 08018ab5c1e5f9fea86b92e3b8881897f681ea39 Merge: 9d7eeb5 b48ba8a Author: Marcus Eriksson <[email protected]> AuthorDate: Tue Mar 26 10:07:27 2019 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + .../cassandra/db/compaction/CompactionManager.java | 3 ++- .../cassandra/io/sstable/IndexSummaryManager.java | 18 ++++++++++++++++-- src/java/org/apache/cassandra/utils/FBUtilities.java | 2 +- .../cassandra/io/sstable/IndexSummaryManagerTest.java | 14 +++++++++++++- 5 files changed, 33 insertions(+), 5 deletions(-) diff --cc CHANGES.txt index 815c533,0ea7e9e..42fd101 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -4,9 -2,10 +4,10 @@@ Merged from 3.0 * Avoid double closing the iterator to avoid overcounting the number of requests (CASSANDRA-15058) * Improve `nodetool status -r` speed (CASSANDRA-14847) * Improve merkle tree size and time on heap (CASSANDRA-14096) - * Add missing commands to nodetool-completion (CASSANDRA-14916) + * Add missing commands to nodetool_completion (CASSANDRA-14916) * Anti-compaction temporarily corrupts sstable state for readers (CASSANDRA-15004) - Merged from 2.2: +Merged from 2.2: + * Fix index summary redistribution cancellation (CASSANDRA-15045) * Refactor Circle CI configuration (CASSANDRA-14806) * Fixing invalid CQL in security documentation (CASSANDRA-15020) * Multi-version in-JVM dtests (CASSANDRA-14937) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
