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/19a54786 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19a54786 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19a54786 Branch: refs/heads/cassandra-3.11 Commit: 19a547861ad6c68e4ce584ee1b9ffee66bd5042d Parents: 4c6a10a fdc61cb Author: Aleksey Yeshchenko <alek...@apple.com> Authored: Thu Mar 15 17:17:23 2018 +0300 Committer: Aleksey Yeshchenko <alek...@apple.com> Committed: Thu Mar 15 17:17:23 2018 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/service/StorageProxy.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/19a54786/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fcd86ed,6099b01..bae967f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,6 +1,11 @@@ -3.0.17 +3.11.3 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247) + * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170) + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) +Merged from 3.0: - * Adding missing WriteType enum values to v3,v4 and v5 spec (CASSANDRA-13697) + * Respect max hint window when hinting for LWT (CASSANDRA-14215) + * Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697) * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163) * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087) * Log when SSTables are deleted (CASSANDRA-14302) http://git-wip-us.apache.org/repos/asf/cassandra/blob/19a54786/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageProxy.java index 4dc05e3,bf58ef2..52dd8ab --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@@ -522,7 -497,7 +522,7 @@@ public class StorageProxy implements St return false; } - private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean shouldHint, long queryStartNanoTime) throws WriteTimeoutException - private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean allowHints) throws WriteTimeoutException ++ private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean allowHints, long queryStartNanoTime) throws WriteTimeoutException { boolean shouldBlock = consistencyLevel != ConsistencyLevel.ANY; Keyspace keyspace = Keyspace.open(proposal.update.metadata().ksName); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
