Updated Branches: refs/heads/cassandra-1.1 6e5722d7b -> d27e73a86 refs/heads/cassandra-1.1.0 7d3416c13 -> 08e4fb35e refs/heads/trunk e5040e4fd -> 4a60654d1
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/4a60654d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a60654d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a60654d Branch: refs/heads/trunk Commit: 4a60654d1fa381ddb8f26ffc6faed6d67ed1c48f Parents: e5040e4 d27e73a Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Mar 5 17:46:23 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Mar 5 17:46:23 2012 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/cli/CliHelp.yaml | 34 +++++++------- 1 files changed, 17 insertions(+), 17 deletions(-) ----------------------------------------------------------------------