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 0CBEB200B92 for ; Tue, 23 Aug 2016 19:53:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 07D34160A81; Tue, 23 Aug 2016 17:53:30 +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 4FBAE160ABF for ; Tue, 23 Aug 2016 19:53:29 +0200 (CEST) Received: (qmail 11429 invoked by uid 500); 23 Aug 2016 17:53:23 -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 11137 invoked by uid 99); 23 Aug 2016 17:53:23 -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; Tue, 23 Aug 2016 17:53:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1E614E08AF; Tue, 23 Aug 2016 17:53:23 +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, 23 Aug 2016 17:53:25 -0000 Message-Id: <61142ff7d36c43eaa921b41a060fd541@git.apache.org> In-Reply-To: <1491e879cefd4f9ebdf2b252551d89e6@git.apache.org> References: <1491e879cefd4f9ebdf2b252551d89e6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk archived-at: Tue, 23 Aug 2016 17:53:45 -0000 Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7926b33 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7926b33 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7926b33 Branch: refs/heads/trunk Commit: a7926b33968b9b1497fe281547e0cd0c656c7364 Parents: bdeef40 fe3f3da Author: Marcus Eriksson Authored: Tue Aug 23 19:51:17 2016 +0200 Committer: Marcus Eriksson Committed: Tue Aug 23 19:51:17 2016 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/db/compaction/LeveledManifest.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7926b33/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------