Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Tyler Hobbs 2015-02-10 13:21:37 -06:00
commit 187624b114
1 changed files with 1 additions and 1 deletions

View File

@ -1013,7 +1013,7 @@ syntax_rules += r'''
cf=<columnFamilyName> "(" (
col=<cident> |
"keys(" col=<cident> ")" |
"fullCollection(" col=<cident> ")"
"full(" col=<cident> ")"
) ")"
( "USING" <stringLiteral> ( "WITH" "OPTIONS" "=" <mapLiteral> )? )?
;