You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2016/11/16 21:58:45 UTC
[12/24] ambari git commit: Merge branch 'branch-feature-AMBARI-18634'
into trunk
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/branch-feature-AMBARI-18901
Commit: d1d90db50f04e2797b3b20841f475664d631f916
Parents: 58ef394 f4c2dbf
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Nov 16 09:40:27 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
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(-)
----------------------------------------------------------------------