Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6FB971073B for ; Thu, 1 May 2014 18:06:51 +0000 (UTC) Received: (qmail 12481 invoked by uid 500); 1 May 2014 18:06:49 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 12433 invoked by uid 500); 1 May 2014 18:06:48 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 12378 invoked by uid 99); 1 May 2014 18:06:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 May 2014 18:06:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6D70588BD51; Thu, 1 May 2014 18:06:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Thu, 01 May 2014 18:06:49 -0000 Message-Id: <71b3a6f13df748f987d7dd915ba78316@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f74063c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f74063c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f74063c6 Branch: refs/heads/trunk Commit: f74063c6eabb809bb59a2a8979d741e707d32797 Parents: d8490cc 1491f75 Author: Tyler Hobbs Authored: Thu May 1 13:06:31 2014 -0500 Committer: Tyler Hobbs Committed: Thu May 1 13:06:31 2014 -0500 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------