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

Posted to commits@ambari.apache.org by jo...@apache.org on 2018/01/19 14:30:08 UTC

[ambari] 01/01: Merge pull request #151 from jonathan-hurley/AMBARI-22725-trunk-cherry-pick

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

jonathanhurley pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 5cd72cead5b2d892e97b705403155be5f16abab6
Merge: 881b464 76d9a32
Author: Jonathan Hurley <jo...@apache.org>
AuthorDate: Fri Jan 19 09:30:01 2018 -0500

    Merge pull request #151 from jonathan-hurley/AMBARI-22725-trunk-cherry-pick
    
    [AMBARI-22725]  Expose Conditional Elements For Tasks on Upgrade

 .../serveraction/upgrades/ConfigureAction.java     | 51 +++++++++++++++++++---
 .../state/stack/upgrade/ClusterGrouping.java       |  9 ++++
 .../state/stack/upgrade/StageWrapperBuilder.java   | 10 ++++-
 .../ambari/server/state/stack/upgrade/Task.java    |  7 +++
 ambari-server/src/main/resources/upgrade-pack.xsd  |  1 +
 .../ambari/server/state/UpgradeHelperTest.java     | 14 ++++--
 .../HDP/2.2.0/upgrades/upgrade_test_conditions.xml | 22 +++++++++-
 7 files changed, 101 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@ambari.apache.org" <co...@ambari.apache.org>.