Merge branch 'cassandra-3.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/7fcf14fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fcf14fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fcf14fa Branch: refs/heads/trunk Commit: 7fcf14faa4ea0f38840894e371bfda3a2d4c54fb Parents: 7cb33aa e11bd0f Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Nov 12 18:07:36 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Nov 12 18:07:36 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 5 +++ .../cassandra/service/StorageServiceMBean.java | 5 +++ .../org/apache/cassandra/tools/NodeProbe.java | 12 +++++++ .../org/apache/cassandra/tools/NodeTool.java | 3 +- .../tools/nodetool/RefreshSizeEstimates.java | 33 ++++++++++++++++++++ 6 files changed, 58 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fcf14fa/CHANGES.txt ----------------------------------------------------------------------