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 DAEA011BF5 for ; Sat, 17 May 2014 21:13:20 +0000 (UTC) Received: (qmail 10957 invoked by uid 500); 17 May 2014 21:05:16 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 10138 invoked by uid 500); 17 May 2014 21:05:15 -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 8146 invoked by uid 99); 17 May 2014 21:03:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 May 2014 21:03:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8466292E592; Sat, 17 May 2014 21:03:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Sat, 17 May 2014 21:03:43 -0000 Message-Id: In-Reply-To: <61adfc90737746e2bbfa69ab0b0db29c@git.apache.org> References: <61adfc90737746e2bbfa69ab0b0db29c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/4ad6db38 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ad6db38 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ad6db38 Branch: refs/heads/cassandra-2.1 Commit: 4ad6db380ac3f7a2a26fbf0aafe2364981c0912e Parents: 3b8482a eaa78e0 Author: Dave Brosius Authored: Sat May 17 17:03:05 2014 -0400 Committer: Dave Brosius Committed: Sat May 17 17:03:05 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/index/keys/KeysIndex.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ad6db38/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java ----------------------------------------------------------------------