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 94D2D17569 for ; Wed, 1 Apr 2015 11:01:32 +0000 (UTC) Received: (qmail 61389 invoked by uid 500); 1 Apr 2015 11:01:32 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 61258 invoked by uid 500); 1 Apr 2015 11:01: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 61056 invoked by uid 99); 1 Apr 2015 11:01:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2015 11:01:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 175CDE1832; Wed, 1 Apr 2015 11:01:32 +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: Wed, 01 Apr 2015 11:01:34 -0000 Message-Id: In-Reply-To: <6500bfcf634741e7ad79a65f60147261@git.apache.org> References: <6500bfcf634741e7ad79a65f60147261@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b09e3929 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b09e3929 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b09e3929 Branch: refs/heads/trunk Commit: b09e39295cdd26690a7d6f9a7c5417c26e9376fc Parents: 7f0a854 52191eb Author: Marcus Eriksson Authored: Wed Apr 1 12:56:34 2015 +0200 Committer: Marcus Eriksson Committed: Wed Apr 1 12:56:34 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../DateTieredCompactionStrategy.java | 31 ++++++++++---- .../DateTieredCompactionStrategyTest.java | 43 ++++++++++++++++++++ 3 files changed, 67 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b09e3929/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b09e3929/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b09e3929/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java ----------------------------------------------------------------------