Merge branch 'cassandra-1.1' into trunk

This commit is contained in:
Brandon Williams 2012-10-25 05:51:37 -05:00
commit e93eacec70
1 changed files with 1 additions and 1 deletions

View File

@ -250,7 +250,7 @@ cqlsh_extra_syntax_rules = r'''
<debugCommand> ::= "DEBUG" "THINGS"?
;
<helpCommand> ::= ( "HELP" | "?" ) [topic]=( <identifier> | <stringLiteral> )*
<helpCommand> ::= ( "HELP" | "?" ) [topic]=( /[a-z_]*/ )*
;
<tracingCommand> ::= "TRACING" ( switch=( "ON" | "OFF" ) )?