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/6f1ce682 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f1ce682 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f1ce682 Branch: refs/heads/trunk Commit: 6f1ce6823088e9eeb28f6928bed44050024a1f25 Parents: 9e8b7c0 0a1f1c8 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Fri Oct 28 15:41:12 2016 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Fri Oct 28 15:41:12 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/config/DatabaseDescriptor.java | 2 +- src/java/org/apache/cassandra/db/Keyspace.java | 110 ++++++++++++++----- src/java/org/apache/cassandra/db/Mutation.java | 12 +- .../cassandra/service/paxos/PaxosState.java | 2 +- 5 files changed, 92 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f1ce682/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a6410d9,82d3d9c..264f8d5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -102,8 -94,9 +102,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: + * Avoid deadlock due to MV lock contention (CASSANDRA-12689) * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801) * Include SSTable filename in compacting large row message (CASSANDRA-12384) * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
