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/a333a2f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a333a2f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a333a2f3 Branch: refs/heads/trunk Commit: a333a2f3b60a70e177f484c7b6dc9b900eaa9307 Parents: b919187 316e1cd Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Fri Oct 7 16:56:10 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Fri Oct 7 16:56:10 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../DebuggableScheduledThreadPoolExecutor.java | 2 +- .../concurrent/ScheduledExecutors.java | 4 - .../db/compaction/CompactionManager.java | 127 +++++++++++-------- .../db/lifecycle/LifecycleTransaction.java | 14 +- .../io/sstable/format/SSTableReader.java | 15 ++- .../apache/cassandra/net/MessagingService.java | 3 +- .../cassandra/service/StorageService.java | 12 +- .../org/apache/cassandra/utils/ExpiringMap.java | 4 +- 9 files changed, 116 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a333a2f3/CHANGES.txt ----------------------------------------------------------------------
