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 CCD2418478 for ; Thu, 28 May 2015 15:40:16 +0000 (UTC) Received: (qmail 12804 invoked by uid 500); 28 May 2015 15:40:16 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 12718 invoked by uid 500); 28 May 2015 15:40:16 -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 12661 invoked by uid 99); 28 May 2015 15:40:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 May 2015 15:40:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 731BCE1085; Thu, 28 May 2015 15:40:16 +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, 28 May 2015 15:40:17 -0000 Message-Id: <325cec21d61d4b16b22beb35b8e0fd11@git.apache.org> In-Reply-To: <7ef2db57e09a4b77808eaf5aa5b222dd@git.apache.org> References: <7ef2db57e09a4b77808eaf5aa5b222dd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14b98665 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14b98665 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14b98665 Branch: refs/heads/trunk Commit: 14b98665bdb1d4a6074317587d52082e17026506 Parents: 61bea5a f1662b1 Author: Tyler Hobbs Authored: Thu May 28 10:39:37 2015 -0500 Committer: Tyler Hobbs Committed: Thu May 28 10:39:37 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14b98665/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java ----------------------------------------------------------------------