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/684120de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/684120de Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/684120de Branch: refs/heads/cassandra-3.11 Commit: 684120deb8fa5a982fb75523314ccd2181419e31 Parents: 22bb2cf bc1f841 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Apr 24 08:51:32 2018 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Apr 24 08:51:32 2018 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/compaction/CompactionManager.java | 10 +++++----- .../cassandra/db/compaction/AntiCompactionTest.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/684120de/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 990c5db,cf470d6..5450322 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -30,7 -19,9 +30,8 @@@ Merged from 3.0 * Fully utilise specified compaction threads (CASSANDRA-14210) * Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763) Merged from 2.2: + * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411) * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286) - * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891) * Backport circleci yaml (CASSANDRA-14240) Merged from 2.1: * Check checksum before decompressing data (CASSANDRA-14284) http://git-wip-us.apache.org/repos/asf/cassandra/blob/684120de/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
