Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3038632 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3038632 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3038632 Branch: refs/heads/trunk Commit: e3038632580314dfbad057d1d709381636798c84 Parents: 8d1c33f 50a9b1a Author: Robert Stupp <sn...@snazy.de> Authored: Mon Dec 12 20:39:55 2016 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Mon Dec 12 20:39:55 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/e3038632/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3038632/src/java/org/apache/cassandra/net/OutboundTcpConnection.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3038632/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------