Updated Branches: refs/heads/cassandra-1.2 9c320d751 -> ec21288db refs/heads/trunk 7196abc39 -> ec361ab00
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec361ab0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec361ab0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec361ab0 Branch: refs/heads/trunk Commit: ec361ab0028fbd13eae4fbb756e02ede9ead683f Parents: 7196abc ec21288 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jan 14 09:45:07 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jan 14 09:45:07 2013 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/tools/NodeToolHelp.yaml | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ----------------------------------------------------------------------
