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/5e2d3d2f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e2d3d2f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e2d3d2f Branch: refs/heads/cassandra-3.5 Commit: 5e2d3d2fa751e3ae0b1b1a0643a578709e715448 Parents: 6d383be 41bb4bc Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Mar 17 10:18:58 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Mar 17 10:18:58 2016 +0100 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e2d3d2f/doc/cql3/CQL.textile ----------------------------------------------------------------------
