Updated Branches: refs/heads/trunk 48b6df95b -> 9aa8c0f47
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/9aa8c0f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9aa8c0f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9aa8c0f4 Branch: refs/heads/trunk Commit: 9aa8c0f471a3ae76508eb11c71cae26e4a7bb0d7 Parents: 48b6df9 2d72056 Author: Dave Brosius <[email protected]> Authored: Sat May 26 12:02:38 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat May 26 12:02:38 2012 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/Cli.g | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
