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/450fca99 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/450fca99 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/450fca99 Branch: refs/heads/trunk Commit: 450fca99df3ddec25114f614de535f5eae0d9ec9 Parents: 21103be e654c1b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Dec 22 11:54:21 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Dec 22 11:54:21 2015 +0100 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/450fca99/doc/cql3/CQL.textile ----------------------------------------------------------------------