Description of problem: There are no code changes in this commit. Only a few very small file differences that need to be checked in. Additional info: No validation is necessary.
New commit detected on manageiq/master: https://github.com/ManageIQ/manageiq/commit/097de5ba0652414387325df973e224d329151f29 commit 097de5ba0652414387325df973e224d329151f29 Author: Tina Fitzgerald <tfitzger> AuthorDate: Mon Dec 1 15:53:32 2014 -0500 Commit: Tina Fitzgerald <tfitzger> CommitDate: Mon Dec 1 15:55:08 2014 -0500 ManageIQ domain - Resolve file differences from model import/export. Previous ManageIQ model changes were made from updating model components in the file system. There are no new code changes in this commit, but need to resolve the file differences resulting from the export/import model round trip. https://bugzilla.redhat.com/show_bug.cgi?id=1169502 .../fixtures/ae_datastore/ManageIQ/.manifest.yaml | 2296 ++++++++++---------- .../VMProvision_Template.class/__class__.yaml | 1 - .../__methods__/task_finished.yaml | 4 +- .../host_provision_finished.yaml | 3 +- .../service_provision_finished.yaml | 3 +- .../vm_migrate_finished.yaml | 3 +- .../vm_provision_finished.yaml | 3 +- 7 files changed, 1158 insertions(+), 1155 deletions(-)
New commit detected on cfme/5.3.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=4a27bf8ed574051ae7260c31d6f801ec9c6a7fb1 commit 4a27bf8ed574051ae7260c31d6f801ec9c6a7fb1 Author: Tina Fitzgerald <tfitzger> AuthorDate: Mon Dec 1 15:53:32 2014 -0500 Commit: Tina Fitzgerald <tfitzger> CommitDate: Mon Dec 8 12:25:49 2014 -0500 ManageIQ domain - Resolve file differences from model import/export. Previous ManageIQ model changes were made from updating model components in the file system. There are no new code changes in this commit, but need to resolve the file differences resulting from the export/import model round trip. https://bugzilla.redhat.com/show_bug.cgi?id=1169502 .../fixtures/ae_datastore/ManageIQ/.manifest.yaml | 2296 ++++++++++---------- .../VMProvision_Template.class/__class__.yaml | 1 - .../__methods__/task_finished.yaml | 4 +- .../host_provision_finished.yaml | 3 +- .../service_provision_finished.yaml | 3 +- .../vm_migrate_finished.yaml | 3 +- .../vm_provision_finished.yaml | 3 +- 7 files changed, 1158 insertions(+), 1155 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://rhn.redhat.com/errata/RHBA-2015-1100.html