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 ED842200B3B for ; Mon, 11 Jul 2016 15:39:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EC133160A78; Mon, 11 Jul 2016 13:39:18 +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 39601160A5E for ; Mon, 11 Jul 2016 15:39:18 +0200 (CEST) Received: (qmail 7538 invoked by uid 500); 11 Jul 2016 13:39:12 -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 6637 invoked by uid 99); 11 Jul 2016 13:39:11 -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; Mon, 11 Jul 2016 13:39:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5DC9BEC22C; Mon, 11 Jul 2016 13:39:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Mon, 11 Jul 2016 13:39:16 -0000 Message-Id: In-Reply-To: <3b906607699f4b48a838e99ddb7e8c56@git.apache.org> References: <3b906607699f4b48a838e99ddb7e8c56@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk archived-at: Mon, 11 Jul 2016 13:39:19 -0000 Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3bb14ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3bb14ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3bb14ac Branch: refs/heads/trunk Commit: c3bb14acef7a24414cc5cd513a5833f19cc37719 Parents: ec02e6a 371a147 Author: Aleksey Yeschenko Authored: Mon Jul 11 14:37:17 2016 +0100 Committer: Aleksey Yeschenko Committed: Mon Jul 11 14:37:17 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/CompactTables.java | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3bb14ac/CHANGES.txt ----------------------------------------------------------------------