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/986b7a60 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/986b7a60 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/986b7a60 Branch: refs/heads/trunk Commit: 986b7a6032938163a429a909065a060cd7cefd8c Parents: f5fa978 dd1dd8e Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Dec 1 13:17:30 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Dec 1 13:17:30 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 5 +++++ src/java/org/apache/cassandra/service/StorageServiceMBean.java | 3 +++ src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++ 3 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/986b7a60/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/986b7a60/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/986b7a60/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
