You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/02/10 20:21:56 UTC
[1/2] cassandra git commit: nija: fix cqlsh completion for full()
collection indexes
Repository: cassandra
Updated Branches:
refs/heads/trunk 0af528b94 -> 187624b11
nija: fix cqlsh completion for full() collection indexes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad91d416
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad91d416
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad91d416
Branch: refs/heads/trunk
Commit: ad91d41628e6e2ff89d552fc3630682cd1c29f3f
Parents: f5380de
Author: Tyler Hobbs <ty...@apache.org>
Authored: Tue Feb 10 13:20:51 2015 -0600
Committer: Tyler Hobbs <ty...@apache.org>
Committed: Tue Feb 10 13:20:51 2015 -0600
----------------------------------------------------------------------
pylib/cqlshlib/cql3handling.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad91d416/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 31f0de2..f089cd7 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -1001,7 +1001,7 @@ syntax_rules += r'''
cf=<columnFamilyName> "(" (
col=<cident> |
"keys(" col=<cident> ")" |
- "fullCollection(" col=<cident> ")"
+ "full(" col=<cident> ")"
) ")"
( "USING" <stringLiteral> ( "WITH" "OPTIONS" "=" <mapLiteral> )? )?
;
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/187624b1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/187624b1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/187624b1
Branch: refs/heads/trunk
Commit: 187624b114711febc452ab70362014e986a1b24e
Parents: 0af528b ad91d41
Author: Tyler Hobbs <ty...@apache.org>
Authored: Tue Feb 10 13:21:37 2015 -0600
Committer: Tyler Hobbs <ty...@apache.org>
Committed: Tue Feb 10 13:21:37 2015 -0600
----------------------------------------------------------------------
pylib/cqlshlib/cql3handling.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/187624b1/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------