Merge branch 'cassandra-3.0' into trunk
Conflicts:
src/java/org/apache/cassandra/service/CassandraDaemon.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe0f4474
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe0f4474
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe0f4474
Branch: refs/heads/trunk
Commit: fe0f447410e8493c04f080688140f264c65e3d96
Parents: 87da74e 6f3d1e2
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Oct 12 14:55:44 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Oct 12 14:55:44 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/service/CassandraDaemon.java | 31 ++++++-----
.../cassandra/tools/SSTableExpiredBlockers.java | 4 +-
.../cassandra/tools/SSTableLevelResetter.java | 2 +
.../cassandra/tools/SSTableMetadataViewer.java | 2 +
.../cassandra/tools/SSTableOfflineRelevel.java | 3 +
.../tools/SSTableRepairedAtSetter.java | 2 +
.../cassandra/tools/StandaloneScrubber.java | 2 +
.../cassandra/tools/StandaloneSplitter.java | 2 +
.../cassandra/tools/StandaloneUpgrader.java | 2 +
.../cassandra/tools/StandaloneVerifier.java | 2 +
src/java/org/apache/cassandra/tools/Util.java | 58 ++++++++++++++++++++
12 files changed, 95 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe0f4474/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe0f4474/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
|