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 2C116200BC1 for ; Wed, 16 Nov 2016 15:40:52 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2ABDF160B17; Wed, 16 Nov 2016 14:40:52 +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 735AF160B08 for ; Wed, 16 Nov 2016 15:40:51 +0100 (CET) Received: (qmail 68029 invoked by uid 500); 16 Nov 2016 14:40:50 -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 68004 invoked by uid 99); 16 Nov 2016 14:40:50 -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, 16 Nov 2016 14:40:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 89D0FE38B1; Wed, 16 Nov 2016 14:40:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Wed, 16 Nov 2016 14:40:52 -0000 Message-Id: <3522328e21cb42879a6002112cededbf@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] ambari git commit: Merge branch 'branch-feature-AMBARI-18634' into trunk archived-at: Wed, 16 Nov 2016 14:40:52 -0000 Merge branch 'branch-feature-AMBARI-18634' into trunk Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d1d90db5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d1d90db5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d1d90db5 Branch: refs/heads/trunk Commit: d1d90db50f04e2797b3b20841f475664d631f916 Parents: 58ef394 f4c2dbf Author: Nate Cole Authored: Wed Nov 16 09:40:27 2016 -0500 Committer: Nate Cole Committed: Wed Nov 16 09:40:27 2016 -0500 ---------------------------------------------------------------------- .../internal/UpgradeResourceProvider.java | 6 ++++++ .../state/stack/upgrade/HostOrderGrouping.java | 2 +- .../server/upgrade/AbstractUpgradeCatalog.java | 3 --- .../HDP/2.5/upgrades/host-ordered-upgrade.xml | 17 +++++++++++++++-- 4 files changed, 22 insertions(+), 6 deletions(-) ----------------------------------------------------------------------