Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f383612 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f383612 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f383612 Branch: refs/heads/cassandra-2.0 Commit: 3f38361271ffc84d4aca32e29b9b5af996825424 Parents: 8d2c3fe dfd28d2 Author: Sylvain Lebresne <[email protected]> Authored: Mon Mar 10 18:02:46 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Mar 10 18:02:46 2014 +0100 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f383612/doc/cql3/CQL.textile ---------------------------------------------------------------------- diff --cc doc/cql3/CQL.textile index aa2c176,ecd3b7e..2de59d1 --- a/doc/cql3/CQL.textile +++ b/doc/cql3/CQL.textile @@@ -219,12 -214,9 +219,9 @@@ bc(syntax). '(' <definition> ( ',' <definition> )* ')' ( WITH <option> ( AND <option>)* )? -<column-definition> ::= <identifier> <type> ( PRIMARY KEY )? +<column-definition> ::= <identifier> <type> ( STATIC )? ( PRIMARY KEY )? | PRIMARY KEY '(' <partition-key> ( ',' <identifier> )* ')' - <partition-key> ::= <partition-key> - | '(' <partition-key> ( ',' <identifier> )* ')' - <partition-key> ::= <identifier> | '(' <identifier> (',' <identifier> )* ')'
