You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@ambari.apache.org by jl...@apache.org on 2018/07/07 07:59:36 UTC

[ambari] 02/04: Merge branch 'branch-feature-AMBARI-14714' of https://github.com/apache/ambari into branch-feature-AMBARI-14714

This is an automated email from the ASF dual-hosted git repository.

jluniya pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit a8bae2c9aa86b98aeef3e4a5195a712a0515b6b9
Merge: 220450b 9630684
Author: Jayush Luniya <jl...@HW11039.local>
AuthorDate: Sat Jul 7 00:40:17 2018 -0700

    Merge branch 'branch-feature-AMBARI-14714' of https://github.com/apache/ambari into branch-feature-AMBARI-14714

 .../apache/ambari/server/state/UpgradeHelper.java  | 78 +---------------------
 .../ambari/server/state/stack/UpgradePack.java     | 28 --------
 .../stack/upgrade/RepositoryVersionHelper.java     | 42 ------------
 ambari-server/src/main/resources/upgrade-pack.xsd  |  2 -
 .../checks/HostsMasterMaintenanceCheckTest.java    |  3 -
 .../PreUpgradeCheckResourceProviderTest.java       |  4 --
 .../mpacks-v2/upgrade-packs/upgrade-basic.xml      |  2 -
 7 files changed, 1 insertion(+), 158 deletions(-)