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