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/723d055d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/723d055d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/723d055d Branch: refs/heads/trunk Commit: 723d055d81d7cbfc16b79bdeebcd79523bc35719 Parents: dbd7839 2e18adf Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Tue Oct 4 09:55:56 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Tue Oct 4 09:55:56 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/logback.xml | 3 +- .../DebuggableScheduledThreadPoolExecutor.java | 2 +- .../apache/cassandra/service/StorageProxy.java | 8 +- .../cassandra/service/StorageService.java | 285 ++++++++++--------- .../cassandra/service/StorageServiceMBean.java | 2 + .../org/apache/cassandra/tools/NodeProbe.java | 10 + .../cql3/validation/entities/UFTest.java | 4 +- 8 files changed, 178 insertions(+), 137 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/723d055d/CHANGES.txt ----------------------------------------------------------------------
