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 A20F310523 for ; Tue, 1 Apr 2014 20:29:38 +0000 (UTC) Received: (qmail 55816 invoked by uid 500); 1 Apr 2014 20:29:38 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 55526 invoked by uid 500); 1 Apr 2014 20:29:32 -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 55340 invoked by uid 99); 1 Apr 2014 20:29:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2014 20:29:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EDE5A92481A; Tue, 1 Apr 2014 20:29:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Tue, 01 Apr 2014 20:29:31 -0000 Message-Id: <40ef0f7565c141f58f79e746b78e950e@git.apache.org> In-Reply-To: <766eb162e6674c9aa99cd488dd6eb611@git.apache.org> References: <766eb162e6674c9aa99cd488dd6eb611@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92b40fd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92b40fd9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92b40fd9 Branch: refs/heads/cassandra-2.1 Commit: 92b40fd90d9d590b738a325ee68ca80acfaa97f9 Parents: d6b5826 80b3e6c Author: Marcus Eriksson Authored: Tue Apr 1 22:26:49 2014 +0200 Committer: Marcus Eriksson Committed: Tue Apr 1 22:26:49 2014 +0200 ---------------------------------------------------------------------- .../cassandra/db/compaction/AbstractCompactionStrategy.java | 5 ++++- .../cassandra/db/compaction/SizeTieredCompactionStrategy.java | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b40fd9/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b40fd9/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java ----------------------------------------------------------------------