Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25dca466 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25dca466 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25dca466 Branch: refs/heads/trunk Commit: 25dca46697685fd45be6ac3928bef713bb609c76 Parents: 39680ee 84136ce Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Tue Jun 16 12:33:15 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Tue Jun 16 12:33:15 2015 -0500 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
