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 EBE5AF81A for ; Wed, 21 Aug 2013 17:31:59 +0000 (UTC) Received: (qmail 2642 invoked by uid 500); 21 Aug 2013 17:31:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 2596 invoked by uid 500); 21 Aug 2013 17:31:59 -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 2146 invoked by uid 99); 21 Aug 2013 17:31:58 -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, 21 Aug 2013 17:31:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BF3698C1C61; Wed, 21 Aug 2013 17:31:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Wed, 21 Aug 2013 17:32:05 -0000 Message-Id: <4ab032e44e1b45d5a31aa1c355e7d39d@git.apache.org> In-Reply-To: <7284b42297784898ae238cbe3ca25adf@git.apache.org> References: <7284b42297784898ae238cbe3ca25adf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/10] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0 Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e296196 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e296196 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e296196 Branch: refs/heads/cassandra-2.0 Commit: 9e2961964e8b6129ff03fd066951fcad3be12742 Parents: b362aeb 9dc4c16 Author: Jonathan Ellis Authored: Wed Aug 21 12:31:42 2013 -0500 Committer: Jonathan Ellis Committed: Wed Aug 21 12:31:42 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------