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/83894adf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83894adf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83894adf Branch: refs/heads/trunk Commit: 83894adf15e13f350e7920c86ae421d422139411 Parents: 68b27b8 6f97804 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Fri Dec 16 12:53:37 2016 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Fri Dec 16 12:53:37 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83894adf/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4506324,1563d6b..1b1c1f1 --- 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: + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) * Add parent repair session id to anticompaction log message (CASSANDRA-12186) * 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)
