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 5DFC1E1F4 for ; Wed, 19 Dec 2012 02:48:10 +0000 (UTC) Received: (qmail 40937 invoked by uid 500); 19 Dec 2012 02:48:08 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 40788 invoked by uid 500); 19 Dec 2012 02:48:08 -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 40104 invoked by uid 99); 19 Dec 2012 02:48:06 -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, 19 Dec 2012 02:48:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1A33481ECED; Wed, 19 Dec 2012 02:48:06 +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 X-Mailer: ASF-Git Admin Mailer Subject: [2/13] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2 Message-Id: <20121219024806.1A33481ECED@tyr.zones.apache.org> Date: Wed, 19 Dec 2012 02:48:06 +0000 (UTC) Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/800b4f1f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/800b4f1f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/800b4f1f Branch: refs/heads/cassandra-1.2 Commit: 800b4f1f6d9df0b3c21a8bcca7cc53e21629d159 Parents: 892d72a 08cc800 Author: Jonathan Ellis Authored: Tue Dec 18 20:47:54 2012 -0600 Committer: Jonathan Ellis Committed: Tue Dec 18 20:47:54 2012 -0600 ---------------------------------------------------------------------- .../db/compaction/ParallelCompactionIterable.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) ----------------------------------------------------------------------