Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2ef5647 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2ef5647 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2ef5647 Branch: refs/heads/trunk Commit: b2ef56478d5be36d5e20932428698ed930b9b992 Parents: afe2e14 d402cf6 Author: Vijay <[email protected]> Authored: Mon Apr 28 21:39:20 2014 -0700 Committer: Vijay <[email protected]> Committed: Mon Apr 28 21:39:20 2014 -0700 ---------------------------------------------------------------------- conf/logback.xml | 2 +- .../cassandra/service/StorageService.java | 49 ++++++++++++++++++-- .../cassandra/service/StorageServiceMBean.java | 21 ++++++++- .../org/apache/cassandra/tools/NodeProbe.java | 17 +++++++ .../org/apache/cassandra/tools/NodeTool.java | 32 ++++++++++++- 5 files changed, 114 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2ef5647/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
