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/c87dc1ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c87dc1ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c87dc1ae Branch: refs/heads/cassandra-3.11 Commit: c87dc1ae7fc0df0649e06a4c611d1cc5488dbb25 Parents: 61edf6f d774005 Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Thu Mar 8 14:28:58 2018 -0800 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Thu Mar 8 14:28:58 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/io/sstable/SSTable.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c87dc1ae/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bb652f3,b49a349..5b8ee0c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -3.0.17 +3.11.3 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) +Merged from 3.0: + * Log when SSTables are deleted (CASSANDRA-14302) * Fix batch commitlog sync regression (CASSANDRA-14292) * Write to pending endpoint when view replica is also base replica (CASSANDRA-14251) * Chain commit log marker potential performance regression in batch commit mode (CASSANDRA-14194) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c87dc1ae/src/java/org/apache/cassandra/io/sstable/SSTable.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
