New commit detected on cfme/5.5.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=802af01e8f01deaa99f60b53db371e019e6af0c0 commit 802af01e8f01deaa99f60b53db371e019e6af0c0 Merge: c3ba0a5 576a587 Author: Greg McCullough <gmccullo> AuthorDate: Mon Feb 29 13:12:19 2016 -0500 Commit: Greg McCullough <gmccullo> CommitDate: Mon Feb 29 13:12:19 2016 -0500 Merge branch 'cherry_pick_zone_fix' into '5.5.z' Clear zone if automate role not enabled. https://bugzilla.redhat.com/show_bug.cgi?id=1303096 Original: https://bugzilla.redhat.com/show_bug.cgi?id=1302107 PR: https://github.com/ManageIQ/manageiq/pull/6870 Clean cherry-pick for miq_ae_engine.rb Conflicts on all spec tests. See merge request !818 lib/miq_automation_engine/engine/miq_ae_engine.rb | 2 +- .../miq_ae_state_machine_multi_spec.rb | 4 +- .../miq_ae_state_machine_retry_spec.rb | 4 +- .../miq_automation_engine/miq_ae_engine_spec.rb | 43 +++++++++++++++++++--- spec/models/resource_action_spec.rb | 4 +- 5 files changed, 48 insertions(+), 9 deletions(-)
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory, and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. https://access.redhat.com/errata/RHBA-2016:0616