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/9cc1152f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9cc1152f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9cc1152f Branch: refs/heads/branch-dev-patch-upgrade Commit: 9cc1152f4864668d1192362e6187ec94d9f457c9 Parents: 0bdaff8 1f4221c Author: Nate Cole <[email protected]> Authored: Fri Nov 4 09:36:59 2016 -0400 Committer: Nate Cole <[email protected]> Committed: Fri Nov 4 09:36:59 2016 -0400 ---------------------------------------------------------------------- .../internal/UpgradeResourceProvider.java | 562 ++++++++++++++----- .../ambari/server/state/UpgradeContext.java | 128 ++++- .../ambari/server/state/UpgradeHelper.java | 3 +- .../state/stack/upgrade/HostOrderGrouping.java | 20 + .../state/stack/upgrade/HostOrderItem.java | 101 ++++ .../stack/upgrade/StageWrapperBuilder.java | 3 +- .../AmbariManagementControllerTest.java | 2 +- .../internal/UpgradeResourceProviderTest.java | 56 ++ .../ambari/server/state/UpgradeHelperTest.java | 186 +++--- .../stack/upgrade/StageWrapperBuilderTest.java | 7 +- .../upgrades/upgrade_test_host_ordered.xml | 44 ++ 11 files changed, 862 insertions(+), 250 deletions(-) ----------------------------------------------------------------------
