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 7DF00112A3 for ; Mon, 21 Apr 2014 10:03:54 +0000 (UTC) Received: (qmail 62460 invoked by uid 500); 21 Apr 2014 10:03:54 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 62208 invoked by uid 500); 21 Apr 2014 10:03:53 -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 61928 invoked by uid 99); 21 Apr 2014 10:03:51 -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, 21 Apr 2014 10:03:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C447098E508; Mon, 21 Apr 2014 10:03:50 +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: Mon, 21 Apr 2014 10:03:52 -0000 Message-Id: <7de223a6fe094af9b412d68027cd6411@git.apache.org> In-Reply-To: <0d63935eb842462898436f191452fea6@git.apache.org> References: <0d63935eb842462898436f191452fea6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.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/8a788e76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a788e76 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a788e76 Branch: refs/heads/trunk Commit: 8a788e76a8760a4d96d068d3692e194d034e50ec Parents: e5ace5b 5c36401 Author: Sylvain Lebresne Authored: Mon Apr 21 12:03:43 2014 +0200 Committer: Sylvain Lebresne Committed: Mon Apr 21 12:03:43 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/SelectStatement.java | 34 ++++++++++++-------- .../cassandra/service/pager/QueryPager.java | 2 +- 3 files changed, 23 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a788e76/CHANGES.txt ----------------------------------------------------------------------