You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/12/01 18:46:52 UTC
[1/2] cassandra git commit: Ninja-add missing consistency levels to
cqlsh
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 9a4712e4d -> 37dfe4303
Ninja-add missing consistency levels to cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/902e43b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/902e43b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/902e43b9
Branch: refs/heads/cassandra-2.1
Commit: 902e43b935552516b5f840190cca4bf87f7dbf0c
Parents: d8642ae
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Dec 1 20:45:07 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Dec 1 20:45:07 2014 +0300
----------------------------------------------------------------------
bin/cqlsh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/902e43b9/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index c99b98c..6be9b78 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -247,9 +247,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> )
[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37dfe430
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37dfe430
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37dfe430
Branch: refs/heads/cassandra-2.1
Commit: 37dfe430349d18fa950fc9b0b88acc1ae2a83502
Parents: 9a4712e 902e43b
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Dec 1 20:46:41 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Dec 1 20:46:41 2014 +0300
----------------------------------------------------------------------
bin/cqlsh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/37dfe430/bin/cqlsh
----------------------------------------------------------------------