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/4d7918df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d7918df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d7918df Branch: refs/heads/trunk Commit: 4d7918df35746f6c832b6fb957a8403077757fe9 Parents: ea909c8 3bf043e Author: Jeff Jirsa <jeff.ji...@crowdstrike.com> Authored: Tue Oct 18 17:28:43 2016 -0700 Committer: Jeff Jirsa <jeff.ji...@crowdstrike.com> Committed: Tue Oct 18 17:31:16 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d7918df/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8f8b7e1,dc98ca7..4c300fe --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -91,6 -84,7 +91,7 @@@ * 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 avg aggregate functions (CASSANDRA-12417) * Preserve quoted reserved keyword column names in MV creation (CASSANDRA-11803)
