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 64479200B93 for ; Fri, 26 Aug 2016 22:47:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6327B160AD5; Fri, 26 Aug 2016 20:47:37 +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 EBDF4160AC9 for ; Fri, 26 Aug 2016 22:47:35 +0200 (CEST) Received: (qmail 72703 invoked by uid 500); 26 Aug 2016 20:47:33 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 72222 invoked by uid 99); 26 Aug 2016 20:47:33 -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; Fri, 26 Aug 2016 20:47:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 84B9DE0243; Fri, 26 Aug 2016 20:47:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rzang@apache.org To: commits@ambari.apache.org Date: Fri, 26 Aug 2016 20:48:02 -0000 Message-Id: In-Reply-To: <30f6699ee3034b42b0994fc8f119c4c7@git.apache.org> References: <30f6699ee3034b42b0994fc8f119c4c7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/50] ambari git commit: Merge remote-tracking branch 'origin/apache-ref/branch-2.4' into 2.4.0-maint archived-at: Fri, 26 Aug 2016 20:47:37 -0000 Merge remote-tracking branch 'origin/apache-ref/branch-2.4' into 2.4.0-maint Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cff41f33 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cff41f33 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cff41f33 Branch: refs/heads/2.4.0-maint Commit: cff41f33e9cc9c629fa2bbda42207236b8b79080 Parents: fa67722 3bb302a Author: Jenkins Authored: Sun Aug 21 22:31:00 2016 +0000 Committer: Jenkins Committed: Sun Aug 21 22:31:00 2016 +0000 ---------------------------------------------------------------------- .../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ----------------------------------------------------------------------