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 1DEFF172A5 for ; Wed, 14 Jan 2015 17:17:36 +0000 (UTC) Received: (qmail 47421 invoked by uid 500); 14 Jan 2015 17:17:37 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 47378 invoked by uid 500); 14 Jan 2015 17:17:37 -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 47191 invoked by uid 99); 14 Jan 2015 17:17:37 -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, 14 Jan 2015 17:17:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 660F1A421B3; Wed, 14 Jan 2015 17:17:37 +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, 14 Jan 2015 17:17:38 -0000 Message-Id: <701470fa2c684ba2832d1bea5b29c4a1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/686b8104 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/686b8104 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/686b8104 Branch: refs/heads/cassandra-2.1 Commit: 686b8104ca7469aee18b9ad4fa8b181e84dca427 Parents: 064144b e16d76d Author: Sylvain Lebresne Authored: Wed Jan 14 18:15:36 2015 +0100 Committer: Sylvain Lebresne Committed: Wed Jan 14 18:15:36 2015 +0100 ---------------------------------------------------------------------- .../db/columniterator/IndexedSliceReader.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/686b8104/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java ----------------------------------------------------------------------