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/84136cef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84136cef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84136cef Branch: refs/heads/cassandra-2.2 Commit: 84136cefde7c70fb5c416cc428c36c66d0391a6d Parents: 2c9b82d 8934a02 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Tue Jun 16 12:32:42 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Tue Jun 16 12:32:42 2015 -0500 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/84136cef/doc/cql3/CQL.textile ----------------------------------------------------------------------
