Updated Branches: refs/heads/trunk 949529af4 -> 567928f5f
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/567928f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/567928f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/567928f5 Branch: refs/heads/trunk Commit: 567928f5fccce72d3530928408cf75312349ca94 Parents: 949529a 1a93de3 Author: Dave Brosius <[email protected]> Authored: Sat Nov 17 20:54:21 2012 -0500 Committer: Dave Brosius <[email protected]> Committed: Sat Nov 17 20:54:21 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/cli/CliHelp.yaml | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) ----------------------------------------------------------------------
