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/66957ece Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66957ece Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66957ece Branch: refs/heads/trunk Commit: 66957ece2d8963d2ac279cb0210dcdd037ba3c05 Parents: 477191b b365edc Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Oct 21 17:39:48 2013 +0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Oct 21 17:39:48 2013 +0800 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeCmd.java | 2 +- src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
