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/53a9250b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53a9250b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53a9250b Branch: refs/heads/branch-dev-patch-upgrade Commit: 53a9250b7f246c152a17cf63f60587eeb6fe5852 Parents: 9cc1152 343b4d8 Author: Nate Cole <[email protected]> Authored: Fri Nov 4 09:39:57 2016 -0400 Committer: Nate Cole <[email protected]> Committed: Fri Nov 4 09:39:57 2016 -0400 ---------------------------------------------------------------------- .../server/state/cluster/ClustersImpl.java | 1 - .../state/stack/upgrade/HostOrderGrouping.java | 174 ++++++++++++++++++- .../stack/upgrade/StageWrapperBuilder.java | 2 +- .../HDP/2.5/upgrades/host-ordered-upgrade.xml | 10 +- .../src/main/resources/upgrade-pack.xsd | 4 +- .../ambari/server/state/UpgradeHelperTest.java | 151 ++++++++++++++-- .../upgrades/upgrade_test_host_ordered.xml | 2 +- .../upgrades/upgrade_test_host_ordered.xml | 2 +- 8 files changed, 307 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
