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 D98B7D041 for ; Mon, 10 Dec 2012 08:48:04 +0000 (UTC) Received: (qmail 80808 invoked by uid 500); 10 Dec 2012 08:48:04 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 80675 invoked by uid 500); 10 Dec 2012 08:48:04 -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 80556 invoked by uid 99); 10 Dec 2012 08:48:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Dec 2012 08:48:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B913E81A511; Mon, 10 Dec 2012 08:48:03 +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: [2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2 Message-Id: <20121210084803.B913E81A511@tyr.zones.apache.org> Date: Mon, 10 Dec 2012 08:48:03 +0000 (UTC) Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/956fa776 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/956fa776 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/956fa776 Branch: refs/heads/trunk Commit: 956fa77689f44a4a4f7c2b57ba1eb38e06eb7527 Parents: f563076 d6ccfb5 Author: Sylvain Lebresne Authored: Mon Dec 10 09:47:18 2012 +0100 Committer: Sylvain Lebresne Committed: Mon Dec 10 09:47:18 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/956fa776/CHANGES.txt ----------------------------------------------------------------------