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 1DCCDFC28 for ; Wed, 27 Mar 2013 10:42:35 +0000 (UTC) Received: (qmail 89325 invoked by uid 500); 27 Mar 2013 10:42:34 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 89271 invoked by uid 500); 27 Mar 2013 10:42:34 -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 89209 invoked by uid 99); 27 Mar 2013 10:42:34 -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, 27 Mar 2013 10:42:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2208C821BCC; Wed, 27 Mar 2013 10:42:34 +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, 27 Mar 2013 10:42:36 -0000 Message-Id: <887ef6999dfe425bbaaf255672d922b9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-1.2' into trunk 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/1527fabf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1527fabf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1527fabf Branch: refs/heads/trunk Commit: 1527fabfce29483cdc62bd98ffeaff7fc7d40903 Parents: f6106a1 61e329f Author: Sylvain Lebresne Authored: Wed Mar 27 11:42:26 2013 +0100 Committer: Sylvain Lebresne Committed: Wed Mar 27 11:42:26 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 + src/java/org/apache/cassandra/cql3/ResultSet.java | 11 +++--- .../cassandra/cql3/statements/SelectStatement.java | 25 ++++++++++++-- 3 files changed, 28 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1527fabf/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1527fabf/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------