New commit detected on cfme/5.5.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=ad287c806b9b9ebb09d6ccb35708920ff4de8215 commit ad287c806b9b9ebb09d6ccb35708920ff4de8215 Merge: 8836fc3 c77fc39 Author: Greg McCullough <gmccullo> AuthorDate: Fri Feb 19 13:05:32 2016 -0500 Commit: Greg McCullough <gmccullo> CommitDate: Fri Feb 19 13:05:32 2016 -0500 Merge branch '5.5.z-default_tenant_1302687' into '5.5.z' Get the tenant user information for Host which does not have a connected provider. Manually merged [Refactor MiqAeEvent#automate_user_ids #6201](https://github.com/ManageIQ/manageiq/pull/6201). Clean cherry-pick [Remove the call to User#groups_include? which has been removed. #6610](https://github.com/ManageIQ/manageiq/pull/6610). Manually merged [Get the tenant user information for Host which does not have a connected provider. #6464](https://github.com/ManageIQ/manageiq/pull/6464). https://bugzilla.redhat.com/show_bug.cgi?id=1308748 See merge request !796 app/models/ems_cluster.rb | 8 ++++ app/models/ems_event.rb | 4 ++ app/models/ext_management_system.rb | 4 ++ app/models/host.rb | 8 ++++ app/models/miq_action.rb | 27 +++--------- app/models/miq_server.rb | 4 ++ app/models/mixins/miq_request_mixin.rb | 1 + app/models/resource_pool.rb | 8 ++++ app/models/service.rb | 6 +++ app/models/storage.rb | 4 ++ app/models/vm_or_template.rb | 6 +++ lib/miq_automation_engine/engine/miq_ae_event.rb | 51 +++------------------- .../lib/miq_automation_engine/miq_ae_event_spec.rb | 15 ++++++- spec/models/ems_cluster_spec.rb | 25 +++++++++++ spec/models/host_spec.rb | 25 +++++++++++ spec/models/resource_pool_spec.rb | 25 +++++++++++ 16 files changed, 154 insertions(+), 67 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