Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68b27b8c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68b27b8c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68b27b8c Branch: refs/heads/trunk Commit: 68b27b8c4090f6d04dd0b2f24e54f09e99168cf4 Parents: 7d266b9 fcc19a1 Author: Paulo Motta <[email protected]> Authored: Thu Dec 15 17:40:55 2016 -0200 Committer: Paulo Motta <[email protected]> Committed: Thu Dec 15 17:40:55 2016 -0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 21 +++++++++++--------- .../cassandra/service/ActiveRepairService.java | 4 ++-- .../db/compaction/AntiCompactionTest.java | 17 ++++++++++------ 4 files changed, 26 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68b27b8c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fd888bc1,6cc177c..4506324 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -133,8 -123,9 +133,9 @@@ * Remove pre-startup check for open JMX port (CASSANDRA-12074) * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) * Restore resumable hints delivery (CASSANDRA-11960) - * Properly report LWT contention (CASSANDRA-12626) + * Properly record CAS contention (CASSANDRA-12626) Merged from 3.0: + * Add parent repair session id to anticompaction log message (CASSANDRA-12186) * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) * Mark MVs as built after successful bootstrap (CASSANDRA-12984) http://git-wip-us.apache.org/repos/asf/cassandra/blob/68b27b8c/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68b27b8c/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java ----------------------------------------------------------------------
