Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2b4f155 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2b4f155 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2b4f155 Branch: refs/heads/cassandra-3.1 Commit: b2b4f155088a2e505cb74134009c9b51110fc1e0 Parents: 5de5d06 44164bc Author: Yuki Morishita <[email protected]> Authored: Mon Nov 30 10:31:46 2015 -0600 Committer: Yuki Morishita <[email protected]> Committed: Mon Nov 30 10:31:46 2015 -0600 ---------------------------------------------------------------------- .../cassandra/service/StorageServiceMBean.java | 22 +++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
