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/8b9f5e5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b9f5e5f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b9f5e5f Branch: refs/heads/trunk Commit: 8b9f5e5f189fe291167e33f956a462986b841e4f Parents: bb20b9d ee0b743 Author: Jason Brown <jasedbr...@gmail.com> Authored: Tue Dec 13 04:36:26 2016 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Tue Dec 13 04:36:48 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b9f5e5f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3a7818e,e3cd5a1..697bdbf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -132,8 -122,9 +132,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: + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) * Thread local pools never cleaned up (CASSANDRA-13033) * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) * CQL often queries static columns unnecessarily (CASSANDRA-12768)
