Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1f8c6f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1f8c6f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1f8c6f7 Branch: refs/heads/trunk Commit: d1f8c6f7a8492a32efa8a2dd29a6061d0c618550 Parents: 4668110 edd1226 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Oct 21 15:40:30 2013 +0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Oct 21 15:40:30 2013 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- src/java/org/apache/cassandra/service/StorageProxyMBean.java | 2 +- src/java/org/apache/cassandra/tools/NodeCmd.java | 7 ++++++- src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++ src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 3 +++ 6 files changed, 17 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1f8c6f7/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1f8c6f7/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
