Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-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 49EBB10F3F for ; Tue, 5 May 2015 16:12:48 +0000 (UTC) Received: (qmail 20666 invoked by uid 500); 5 May 2015 16:12:48 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 20508 invoked by uid 500); 5 May 2015 16:12:48 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 20491 invoked by uid 99); 5 May 2015 16:12: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; Tue, 05 May 2015 16:12:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EED86E10A1; Tue, 5 May 2015 16:12:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gates@apache.org To: commits@hive.apache.org Date: Tue, 05 May 2015 16:12:48 -0000 Message-Id: <8839cb630d844b3cb570add8affff9f6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] hive git commit: Merge branch 'ci8915' Merge branch 'ci8915' Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f895b277 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f895b277 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f895b277 Branch: refs/heads/master Commit: f895b277399fc37cdcd349a321ddf12c49756a5c Parents: 1988615 c40c6de Author: Alan Gates Authored: Tue May 5 09:12:15 2015 -0700 Committer: Alan Gates Committed: Tue May 5 09:12:15 2015 -0700 ---------------------------------------------------------------------- .../hadoop/hive/ql/txn/compactor/Cleaner.java | 18 ++++++++---- .../hadoop/hive/ql/txn/compactor/Worker.java | 30 ++++++++++++++------ 2 files changed, 33 insertions(+), 15 deletions(-) ----------------------------------------------------------------------