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/2d21cbda Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d21cbda Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d21cbda Branch: refs/heads/trunk Commit: 2d21cbda228940cbcd9c0bc01c6047af2acdb057 Parents: a92ca61 e303863 Author: Robert Stupp <sn...@snazy.de> Authored: Mon Dec 12 20:39:58 2016 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Mon Dec 12 20:39:58 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../concurrent/NamedThreadFactory.java | 22 +++++++++- .../AbstractCommitLogSegmentManager.java | 3 +- .../db/commitlog/AbstractCommitLogService.java | 3 +- .../cassandra/index/sasi/TermIterator.java | 3 +- .../cassandra/net/OutboundTcpConnection.java | 42 ++++++++++---------- .../apache/cassandra/repair/RepairRunnable.java | 4 +- .../scheduler/RoundRobinScheduler.java | 12 +++--- .../cassandra/service/StorageService.java | 7 ++-- 9 files changed, 58 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d21cbda/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f59f89f,74cab19..d1135bb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -131,8 -122,9 +131,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: + * 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) * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d21cbda/src/java/org/apache/cassandra/net/OutboundTcpConnection.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d21cbda/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
