Updated Branches: refs/heads/trunk ca5318d37 -> acedc3438
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/acedc343 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/acedc343 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/acedc343 Branch: refs/heads/trunk Commit: acedc343821be16c4119400b4ac4e246b890a8ce Parents: ca5318d 96075b3 Author: Brandon Williams <[email protected]> Authored: Fri Jul 27 13:46:06 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Jul 27 13:46:06 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/cli/CliHelp.yaml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
