Merge remote-tracking branch 'refs/remotes/acunu/p/4125/01_admin_tools' into HEAD
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cffa379 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cffa379 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cffa379 Branch: refs/heads/vnodes Commit: 5cffa379466678e7d6e381124677decd9756729d Parents: e905fff a1e1ab4 Author: Eric Evans <[email protected]> Authored: Sat Jul 14 12:37:22 2012 -0600 Committer: Eric Evans <[email protected]> Committed: Sat Jul 14 12:37:22 2012 -0600 ---------------------------------------------------------------------- .topdeps | 2 +- .topmsg | 4 +- .../apache/cassandra/service/StorageService.java | 25 ++- .../cassandra/service/StorageServiceMBean.java | 14 +- src/java/org/apache/cassandra/tools/NodeCmd.java | 172 +++++++++++---- src/java/org/apache/cassandra/tools/NodeProbe.java | 18 ++- 6 files changed, 176 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
