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/99691be1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99691be1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99691be1 Branch: refs/heads/trunk Commit: 99691be14f0bfcba71a2b75343332126c6e749e8 Parents: 08e3346 7c6e552 Author: Jonathan Ellis <[email protected]> Authored: Tue Sep 24 08:41:23 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Sep 24 08:41:23 2013 -0500 ---------------------------------------------------------------------- src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
