Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 162A5200B4B for ; Wed, 6 Jul 2016 10:13:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 14E89160A64; Wed, 6 Jul 2016 08:13:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5BF78160A79 for ; Wed, 6 Jul 2016 10:13:40 +0200 (CEST) Received: (qmail 4007 invoked by uid 500); 6 Jul 2016 08:13:38 -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 2949 invoked by uid 99); 6 Jul 2016 08:13:38 -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, 06 Jul 2016 08:13:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EEA1EED312; Wed, 6 Jul 2016 08:13:37 +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, 06 Jul 2016 08:13:51 -0000 Message-Id: <40a4bfc62ca74698b7fc79c04fcabaa2@git.apache.org> In-Reply-To: <22bd913d67944337b232a1f079850046@git.apache.org> References: <22bd913d67944337b232a1f079850046@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/16] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9 archived-at: Wed, 06 Jul 2016 08:13:41 -0000 Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/262cd38b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/262cd38b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/262cd38b Branch: refs/heads/trunk Commit: 262cd38b0179c8ff2b8a60509f10d669c21c8312 Parents: 574e8df 73c7167 Author: Marcus Eriksson Authored: Wed Jul 6 10:11:29 2016 +0200 Committer: Marcus Eriksson Committed: Wed Jul 6 10:11:29 2016 +0200 ---------------------------------------------------------------------- .../cassandra/db/compaction/DateTieredCompactionStrategyTest.java | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------