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/e11bd0fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e11bd0fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e11bd0fa Branch: refs/heads/cassandra-3.1 Commit: e11bd0fa8cb2768037143f5ed8c772f8a84c64b4 Parents: 5576f45 9f056a9 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Nov 12 18:07:10 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Nov 12 18:07:10 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/e11bd0fa/CHANGES.txt ----------------------------------------------------------------------