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/4489ee8d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4489ee8d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4489ee8d Branch: refs/heads/trunk Commit: 4489ee8d86c3af0fd78068b374e7ee414006ba52 Parents: 8b9f5e5 55adebe Author: Jason Brown <[email protected]> Authored: Tue Dec 13 05:11:58 2016 -0800 Committer: Jason Brown <[email protected]> Committed: Tue Dec 13 05:12:35 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/metadata/MetadataCollector.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4489ee8d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 697bdbf,a225df8..fa81b5f --- 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: + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) * 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)
