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 9AC78D80D for ; Fri, 16 Nov 2012 11:39:10 +0000 (UTC) Received: (qmail 9335 invoked by uid 500); 16 Nov 2012 11:39:10 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 9306 invoked by uid 500); 16 Nov 2012 11:39:10 -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 9289 invoked by uid 99); 16 Nov 2012 11:39:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Nov 2012 11:39:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 09238313E21; Fri, 16 Nov 2012 11:39:10 +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 X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20121116113910.09238313E21@tyr.zones.apache.org> Date: Fri, 16 Nov 2012 11:39:10 +0000 (UTC) Updated Branches: refs/heads/trunk 0608330c5 -> 69accb311 Merge branch 'cassandra-1.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/69accb31 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69accb31 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69accb31 Branch: refs/heads/trunk Commit: 69accb31149aa9d41bcca3aaf2417c014294e888 Parents: 0608330 d17c6f2 Author: Sylvain Lebresne Authored: Fri Nov 16 12:39:04 2012 +0100 Committer: Sylvain Lebresne Committed: Fri Nov 16 12:39:04 2012 +0100 ---------------------------------------------------------------------- NEWS.txt | 3 +++ doc/cql3/CQL.textile | 6 +----- src/java/org/apache/cassandra/cql3/Cql.g | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) ----------------------------------------------------------------------