Review Request 62354: Exception was thrown while starting Patch Rolling/Express Upgrade when upgrade failure tolerance option is selected

[Nate Cole]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/62354/
-----------------------------------------------------------

Review request for Ambari, Dmitro Lisnichenko and Jonathan Hurley.


Bugs: AMBARI-21967
    https://issues.apache.org/jira/browse/AMBARI-21967


Repository: ambari


Description
-------

Missed a situation where the service-check merging logic failed.


Diffs
-----

  ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java 
e6ca728ee6 
  
ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
 5dfbc53b8f 


Diff: https://reviews.apache.org/r/62354/diff/1/


Testing
-------

Manual.  Automated pending.


Thanks,

Nate Cole