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/e654c1bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e654c1bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e654c1bf Branch: refs/heads/cassandra-3.0 Commit: e654c1bf040ffe14e0da9a0c3246aaababe12178 Parents: ebbd516 e438831 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Dec 22 11:53:40 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Dec 22 11:53:40 2015 +0100 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e654c1bf/doc/cql3/CQL.textile ----------------------------------------------------------------------