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/7d266b9e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d266b9e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d266b9e Branch: refs/heads/trunk Commit: 7d266b9e79e0738df25e4f86b5bdccb030a02d88 Parents: 0f67b54 b1e23ab Author: Paulo Motta <pa...@apache.org> Authored: Thu Dec 15 16:51:12 2016 -0200 Committer: Paulo Motta <pa...@apache.org> Committed: Thu Dec 15 16:51:12 2016 -0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Keyspace.java | 89 +++++++++++--------- src/java/org/apache/cassandra/db/Mutation.java | 17 ++-- .../db/commitlog/CommitLogReplayer.java | 10 +-- src/java/org/apache/cassandra/hints/Hint.java | 40 ++++++--- .../apache/cassandra/hints/HintVerbHandler.java | 4 +- .../cassandra/service/paxos/PaxosState.java | 9 +- .../cassandra/streaming/StreamReceiveTask.java | 6 +- 8 files changed, 90 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d266b9e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e0c5637,5f7cf93..fd888bc1 --- 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: + * 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) * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d266b9e/src/java/org/apache/cassandra/db/Mutation.java ----------------------------------------------------------------------