Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6dd2b89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6dd2b89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6dd2b89 Branch: refs/heads/cassandra-2.2 Commit: a6dd2b893451ae0e88048878dfeb609c4d240cc5 Parents: 4fc5851 df9e798 Author: Marcus Eriksson <[email protected]> Authored: Thu Aug 20 18:15:55 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu Aug 20 18:15:55 2015 +0200 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6dd2b89/doc/cql3/CQL.textile ----------------------------------------------------------------------
