merge from 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f85e105 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f85e105 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f85e105 Branch: refs/heads/trunk Commit: 9f85e1050f14da42f28132c146e078f8d03d0349 Parents: 23c458a 1cdad63 Author: Pavel Yaskevich <xe...@apache.org> Authored: Tue Mar 13 17:59:43 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Tue Mar 13 17:59:43 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cli/CliHelp.yaml | 44 +++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f85e105/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f85e105/src/resources/org/apache/cassandra/cli/CliHelp.yaml ----------------------------------------------------------------------
