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/df9e798d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df9e798d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df9e798d Branch: refs/heads/cassandra-2.1 Commit: df9e798de6eb4b47eacab209f82bc7e72347946a Parents: 755a6b2 500c035 Author: Marcus Eriksson <[email protected]> Authored: Thu Aug 20 18:15:43 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu Aug 20 18:15:43 2015 +0200 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df9e798d/doc/cql3/CQL.textile ----------------------------------------------------------------------
