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 B689B10EAD for ; Wed, 15 Oct 2014 17:15:54 +0000 (UTC) Received: (qmail 25786 invoked by uid 500); 15 Oct 2014 17:15:54 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 25658 invoked by uid 500); 15 Oct 2014 17:15:54 -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 25640 invoked by uid 99); 15 Oct 2014 17:15:54 -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, 15 Oct 2014 17:15:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 31B0992FB15; Wed, 15 Oct 2014 17:15:54 +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: Wed, 15 Oct 2014 17:15:55 -0000 Message-Id: <9b2528a144bd4e9c9402c2bbdbe147e2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/2623982e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2623982e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2623982e Branch: refs/heads/trunk Commit: 2623982e8b6f03b703eddaf830b69cc2dcafff5d Parents: e2df76e ba79107 Author: Tyler Hobbs Authored: Wed Oct 15 12:15:41 2014 -0500 Committer: Tyler Hobbs Committed: Wed Oct 15 12:15:41 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/filter/ExtendedFilter.java | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------