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 9BED217A27 for ; Fri, 9 Jan 2015 05:29:30 +0000 (UTC) Received: (qmail 20296 invoked by uid 500); 9 Jan 2015 05:29:31 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 20182 invoked by uid 500); 9 Jan 2015 05:29:31 -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 20021 invoked by uid 99); 9 Jan 2015 05: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; Fri, 09 Jan 2015 05:29:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6CA8D92B18C; Fri, 9 Jan 2015 05:29:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Fri, 09 Jan 2015 05:29:33 -0000 Message-Id: In-Reply-To: <996eeef78d054482b626a6f1303e9f57@git.apache.org> References: <996eeef78d054482b626a6f1303e9f57@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/dde4d829 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dde4d829 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dde4d829 Branch: refs/heads/trunk Commit: dde4d82938f0d5951b0473cfb9d62d7ab0d9b637 Parents: 2fc3a89 818ec33 Author: Dave Brosius Authored: Fri Jan 9 00:28:56 2015 -0500 Committer: Dave Brosius Committed: Fri Jan 9 00:28:56 2015 -0500 ---------------------------------------------------------------------- .../db/compaction/DateTieredCompactionStrategyTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dde4d829/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java ----------------------------------------------------------------------