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 B3DF4C0FA for ; Thu, 3 May 2012 08:00:58 +0000 (UTC) Received: (qmail 75123 invoked by uid 500); 3 May 2012 08:00:58 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 75017 invoked by uid 500); 3 May 2012 08:00:58 -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 75002 invoked by uid 99); 3 May 2012 08:00:58 -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, 03 May 2012 08:00:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4C58813A87; Thu, 3 May 2012 08:00:56 +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/2] git commit: Merge branch 'cassandra-1.1' into trunk Message-Id: <20120503080057.4C58813A87@tyr.zones.apache.org> Date: Thu, 3 May 2012 08:00:56 +0000 (UTC) Updated Branches: refs/heads/trunk a0f5dc515 -> fb2bfc984 Merge branch 'cassandra-1.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/fb2bfc98 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb2bfc98 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb2bfc98 Branch: refs/heads/trunk Commit: fb2bfc9846fa12211adf45e1bac23814fe099740 Parents: a0f5dc5 a75b708 Author: Sylvain Lebresne Authored: Thu May 3 10:00:36 2012 +0200 Committer: Sylvain Lebresne Committed: Thu May 3 10:00:36 2012 +0200 ---------------------------------------------------------------------- .../cassandra/cql3/statements/SelectStatement.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb2bfc98/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------