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/b685e111 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b685e111 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b685e111 Branch: refs/heads/trunk Commit: b685e11186dd4fa404b2b621eda78b8f2eb69a15 Parents: 3f14657 2ab1370 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Oct 16 07:33:05 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Oct 16 07:33:05 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeCmd.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------