Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f479eb0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f479eb0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f479eb0 Branch: refs/heads/trunk Commit: 0f479eb0f139f690e130a021191ba31be4f8efe7 Parents: b27c61b 1533f12 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Apr 5 09:54:06 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Apr 5 09:54:06 2013 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/CassandraDaemon.java | 4 ++-- .../apache/cassandra/service/StorageService.java | 2 +- src/java/org/apache/cassandra/tools/NodeCmd.java | 4 ++++ src/java/org/apache/cassandra/tools/NodeProbe.java | 10 ++++++++++ .../org/apache/cassandra/transport/Server.java | 3 ++- .../org/apache/cassandra/tools/NodeToolHelp.yaml | 6 ++++++ 6 files changed, 25 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f479eb0/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f479eb0/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f479eb0/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
