Updated Branches: refs/heads/cassandra-1.1 e4fc1ebba -> 77573c599 refs/heads/trunk c54fe4c41 -> e93eacec7
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/e93eacec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e93eacec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e93eacec Branch: refs/heads/trunk Commit: e93eacec708c4670dae367a62ea1a73da8a9e2a3 Parents: c54fe4c 77573c5 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Oct 25 05:51:37 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Oct 25 05:51:37 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e93eacec/bin/cqlsh ---------------------------------------------------------------------- diff --cc bin/cqlsh index 0b0d6f8,22edde6..9df42bc --- a/bin/cqlsh +++ b/bin/cqlsh @@@ -250,12 -246,9 +250,12 @@@ cqlsh_extra_syntax_rules = r'' <debugCommand> ::= "DEBUG" "THINGS"? ; - <helpCommand> ::= ( "HELP" | "?" ) [topic]=( <identifier> | <stringLiteral> )* + <helpCommand> ::= ( "HELP" | "?" ) [topic]=( /[a-z_]*/ )* ; +<tracingCommand> ::= "TRACING" ( switch=( "ON" | "OFF" ) )? + ; + <exitCommand> ::= "exit" | "quit" ;
