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 C98AB10732 for ; Thu, 8 Jan 2015 20:41:35 +0000 (UTC) Received: (qmail 22042 invoked by uid 500); 8 Jan 2015 20:41:36 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 21914 invoked by uid 500); 8 Jan 2015 20:41:36 -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 21896 invoked by uid 99); 8 Jan 2015 20:41:36 -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, 08 Jan 2015 20:41:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 910688C7D13; Thu, 8 Jan 2015 20:41:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Thu, 08 Jan 2015 20:41:38 -0000 Message-Id: <5b22015d30d94e70ac7a7f75e2759fd0@git.apache.org> In-Reply-To: <32b9b8b4356a41c2a64f77d8ff157486@git.apache.org> References: <32b9b8b4356a41c2a64f77d8ff157486@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra 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/e4123193 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4123193 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4123193 Branch: refs/heads/trunk Commit: e41231933bf8bce865bd43c85e4def525c3535d1 Parents: dd84a29 5674a96 Author: Tyler Hobbs Authored: Thu Jan 8 14:41:25 2015 -0600 Committer: Tyler Hobbs Committed: Thu Jan 8 14:41:25 2015 -0600 ---------------------------------------------------------------------- .../apache/cassandra/db/index/composites/CompositesSearcher.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4123193/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java ----------------------------------------------------------------------