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 2014/07/16 22:38:20 UTC
[1/2] git commit: Ninja: fix grammar for tuple type in CQL docs
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 d2ae187c7 -> 85014dfb6
Ninja: fix grammar for tuple type in CQL docs
Follow up for CASSANDRA-7527
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b988fdd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b988fdd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b988fdd
Branch: refs/heads/cassandra-2.1
Commit: 6b988fddd02011d91cff4a16c2b82bb0f3f3c2fc
Parents: 88e0571
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jul 16 15:36:58 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jul 16 15:36:58 2014 -0500
----------------------------------------------------------------------
doc/cql3/CQL.textile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b988fdd/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 2d45cf1..225491a 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -923,7 +923,7 @@ bc(syntax)..
<collection-type> ::= list '<' <native-type> '>'
| set '<' <native-type> '>'
| map '<' <native-type> ',' <native-type> '>'
-<tuple-type> ::= tuple '<' <native-type> (',' <native-type>)* '>'
+<tuple-type> ::= tuple '<' <type> (',' <type>)* '>'
p. Note that the native types are keywords and as such are case-insensitive. They are however not reserved ones.
p. The following table gives additional informations on the native data types, and on which kind of "constants":#constants each type supports:
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1.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/85014dfb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85014dfb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85014dfb
Branch: refs/heads/cassandra-2.1
Commit: 85014dfb691f37483c5c913a6a398c2c73bd86dd
Parents: d2ae187 6b988fd
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jul 16 15:38:08 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jul 16 15:38:08 2014 -0500
----------------------------------------------------------------------
doc/cql3/CQL.textile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------