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 B9426E1FD for ; Fri, 23 Nov 2012 09:44:27 +0000 (UTC) Received: (qmail 34468 invoked by uid 500); 23 Nov 2012 09:44:27 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 34427 invoked by uid 500); 23 Nov 2012 09:44:27 -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 34410 invoked by uid 99); 23 Nov 2012 09:44:26 -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, 23 Nov 2012 09:44:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BAA73319389; Fri, 23 Nov 2012 09:44:26 +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/5] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20121123094426.BAA73319389@tyr.zones.apache.org> Date: Fri, 23 Nov 2012 09:44:26 +0000 (UTC) Updated Branches: refs/heads/trunk c12d7cf44 -> be89a954b Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/CounterColumn.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be89a954 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be89a954 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be89a954 Branch: refs/heads/trunk Commit: be89a954b369802896599a8bd2003499b95f1112 Parents: c12d7cf d97a5ca Author: Sylvain Lebresne Authored: Fri Nov 23 10:44:18 2012 +0100 Committer: Sylvain Lebresne Committed: Fri Nov 23 10:44:18 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 + src/java/org/apache/cassandra/cql3/Cql.g | 8 ++++- .../cassandra/cql3/statements/SelectStatement.java | 24 ++++++++++++++- .../org/apache/cassandra/db/CounterColumn.java | 12 ++++++- 4 files changed, 42 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be89a954/CHANGES.txt ----------------------------------------------------------------------