You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2016/11/25 08:53:09 UTC
[1/2] cassandra git commit: Fix CQLSH parser syntax (follow-up
CASSANDRA-11935)
Repository: cassandra
Updated Branches:
refs/heads/trunk af922ca6c -> adadd7761
Fix CQLSH parser syntax (follow-up CASSANDRA-11935)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8884302f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8884302f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8884302f
Branch: refs/heads/trunk
Commit: 8884302fac940c0504f1258eddd213aa2e17309d
Parents: 5de016f
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri Nov 25 09:47:57 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri Nov 25 09:47:57 2016 +0100
----------------------------------------------------------------------
pylib/cqlshlib/cql3handling.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8884302f/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index f81b19f..f759422 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -152,7 +152,7 @@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/ ;
<colon> ::= ":" ;
<star> ::= "*" ;
<endtoken> ::= ";" ;
-<op> ::= /[+-=%/,().]/ ;
+<op> ::= /[-+=%/,().]/ ;
<cmp> ::= /[<>!]=?/ ;
<brackets> ::= /[][{}]/ ;
[2/2] cassandra git commit: Merge branch cassandra-3.X into trunk
Posted by bl...@apache.org.
Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adadd776
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adadd776
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adadd776
Branch: refs/heads/trunk
Commit: adadd7761cb940de6db1931b1abd78f1e9f7f687
Parents: af922ca 8884302
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri Nov 25 09:52:30 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri Nov 25 09:52:37 2016 +0100
----------------------------------------------------------------------
pylib/cqlshlib/cql3handling.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------