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 1C824200C63 for ; Wed, 26 Apr 2017 09:44:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1B4FD160B95; Wed, 26 Apr 2017 07:44:51 +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 5D25D160BB4 for ; Wed, 26 Apr 2017 09:44:50 +0200 (CEST) Received: (qmail 92097 invoked by uid 500); 26 Apr 2017 07:44:48 -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 91493 invoked by uid 99); 26 Apr 2017 07:44:48 -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, 26 Apr 2017 07:44:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2D2D6E2F41; Wed, 26 Apr 2017 07:44:48 +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, 26 Apr 2017 07:44:55 -0000 Message-Id: In-Reply-To: <4452d76b66664185927632eea589680a@git.apache.org> References: <4452d76b66664185927632eea589680a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11 archived-at: Wed, 26 Apr 2017 07:44:51 -0000 Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6679b085 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6679b085 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6679b085 Branch: refs/heads/cassandra-3.11 Commit: 6679b085a3798234881fb64fc6202dc35bf06ec1 Parents: 2369faa 8dbf808 Author: Marcus Eriksson Authored: Wed Apr 26 09:39:41 2017 +0200 Committer: Marcus Eriksson Committed: Wed Apr 26 09:39:41 2017 +0200 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------