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 58CDB109A4 for ; Mon, 26 Aug 2013 16:44:05 +0000 (UTC) Received: (qmail 36096 invoked by uid 500); 26 Aug 2013 16:44:04 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 36029 invoked by uid 500); 26 Aug 2013 16:44:03 -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 35775 invoked by uid 99); 26 Aug 2013 16:44:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Aug 2013 16:44:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 64DCB8C5884; Mon, 26 Aug 2013 16:44:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Mon, 26 Aug 2013 16:44:07 -0000 Message-Id: <39dc4dd7ff3347379aa8094e008d0639@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2930de8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2930de8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2930de8 Branch: refs/heads/trunk Commit: b2930de806b64c7dd5f0d97fae5fa308654dbe42 Parents: a50467e 5d7e8c8 Author: Yuki Morishita Authored: Mon Aug 26 11:41:23 2013 -0500 Committer: Yuki Morishita Committed: Mon Aug 26 11:41:23 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/sstable/SSTableReader.java | 12 ++++------ .../cassandra/utils/AlwaysPresentFilter.java | 24 +++++++++----------- .../apache/cassandra/utils/FilterFactory.java | 8 ++----- .../org/apache/cassandra/utils/IFilter.java | 8 ++++--- .../cassandra/utils/Murmur3BloomFilter.java | 6 +++++ 6 files changed, 30 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2930de8/CHANGES.txt ----------------------------------------------------------------------