Merge branch 'cassandra-2.1' into trunk

2014-12-01 20:47:07 +03:00 · 2014-12-01 20:47:07 +03:00 · cb8bda8d47
parent 94ba744b37 37dfe43034
commit cb8bda8d47
1 changed files with 3 additions and 1 deletions
--- a/bin/cqlsh
+++ b/bin/cqlsh
@ -268,9 +268,11 @@ cqlsh_extra_syntax_rules = r'''
                     | "THREE"
                     | "QUORUM"
                     | "ALL"
-                     | "LOCAL_ONE"
                     | "LOCAL_QUORUM"
                     | "EACH_QUORUM"
+                     | "SERIAL"
+                     | "LOCAL_SERIAL"
+                     | "LOCAL_ONE"
                     ;

 <showCommand> ::= "SHOW" what=( "VERSION" | "HOST" | "SESSION" sessionid=<uuid> )