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/23e77445 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23e77445 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23e77445 Branch: refs/heads/trunk Commit: 23e7744598a00b4650b8d34575a3216e8bfd0d7a Parents: ac92623 dbc7978 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Nov 22 19:12:56 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Nov 22 19:12:56 2013 +0300 ---------------------------------------------------------------------- src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 3 --- 1 file changed, 3 deletions(-) ----------------------------------------------------------------------
