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 0DD869C20 for ; Tue, 6 Mar 2012 08:39:21 +0000 (UTC) Received: (qmail 3492 invoked by uid 500); 6 Mar 2012 08:39:20 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 3442 invoked by uid 500); 6 Mar 2012 08:39:20 -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 3420 invoked by uid 99); 6 Mar 2012 08:39:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2012 08:39:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2012 08:39:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4E0B05A5C; Tue, 6 Mar 2012 08:38:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scode@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1 Message-Id: <20120306083856.4E0B05A5C@tyr.zones.apache.org> Date: Tue, 6 Mar 2012 08:38:54 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38e145bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38e145bd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38e145bd Branch: refs/heads/trunk Commit: 38e145bd21d44392fd35bb8820c6a48334471528 Parents: 9418c2a e58540f Author: Peter Schuller Authored: Tue Mar 6 00:37:56 2012 -0800 Committer: Peter Schuller Committed: Tue Mar 6 00:37:56 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/compaction/LeveledManifest.java | 18 +++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/38e145bd/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/38e145bd/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------