Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78b734e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78b734e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78b734e2 Branch: refs/heads/cassandra-2.1 Commit: 78b734e2eb79e541088a4ac404b27be74410ba4a Parents: 6beb13f e0c4c6e Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Aug 7 16:07:29 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Aug 7 16:07:29 2014 +0200 ---------------------------------------------------------------------- .../apache/cassandra/config/DatabaseDescriptor.java | 5 +++++ .../org/apache/cassandra/service/StorageService.java | 6 ++++++ .../apache/cassandra/service/StorageServiceMBean.java | 3 +++ src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++++ src/java/org/apache/cassandra/tools/NodeTool.java | 14 ++++++++++++++ 5 files changed, 32 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/78b734e2/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
