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/620f37c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/620f37c5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/620f37c5 Branch: refs/heads/trunk Commit: 620f37c54e63db1f651c5dc58cdf1c6824f88069 Parents: c87dc1a 2c15098 Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Thu Mar 8 15:38:02 2018 -0800 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Thu Mar 8 15:39:11 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/ColumnCondition.java | 4 ++++ .../operations/InsertUpdateIfConditionTest.java | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/620f37c5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5b8ee0c,9c6a853..0e9ef6d --- 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: + * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/620f37c5/src/java/org/apache/cassandra/cql3/ColumnCondition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/620f37c5/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
