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 7623110852 for ; Wed, 21 Aug 2013 10:16:47 +0000 (UTC) Received: (qmail 20696 invoked by uid 500); 21 Aug 2013 10:16:46 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 20572 invoked by uid 500); 21 Aug 2013 10:16:46 -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 20538 invoked by uid 99); 21 Aug 2013 10:16:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Aug 2013 10:16:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 01DE48C16F1; Wed, 21 Aug 2013 10:16:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Wed, 21 Aug 2013 10:16:48 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/896e1722 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/896e1722 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/896e1722 Branch: refs/heads/trunk Commit: 896e1722da7076105ec1b533c25940616b2bd3b3 Parents: 1bb1ffb c4f6be8 Author: Sylvain Lebresne Authored: Wed Aug 21 12:16:37 2013 +0200 Committer: Sylvain Lebresne Committed: Wed Aug 21 12:16:37 2013 +0200 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) ----------------------------------------------------------------------