Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d27e73a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d27e73a8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d27e73a8 Branch: refs/heads/trunk Commit: d27e73a8689de1a276a1f29445dde100eaafbf1e Parents: 6e5722d 08e4fb3 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Mar 5 17:45:58 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Mar 5 17:45:58 2012 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/cli/CliHelp.yaml | 34 +++++++------- 1 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27e73a8/src/resources/org/apache/cassandra/cli/CliHelp.yaml ----------------------------------------------------------------------
