Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b565fdbd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b565fdbd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b565fdbd Branch: refs/heads/trunk Commit: b565fdbdc9f9eda4997a9f93b1707c5731784c78 Parents: 4a4e707 c38d326 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Mar 26 13:26:31 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Mar 26 13:26:31 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 5 +++++ .../cassandra/service/StorageServiceMBean.java | 7 +++++++ src/java/org/apache/cassandra/tools/NodeCmd.java | 1 + src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++ 4 files changed, 18 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b565fdbd/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b565fdbd/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b565fdbd/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b565fdbd/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
