Awaiting a second MR

Created attachment 1112990 [details]
Hot Fix

Here is the requested hot fix. To deploy, please follow these steps:

1. Copy the attached bz-1293373-tenant-vm-templates.tar to /var/www/miq/vmdb on the appliance.
2. cd to /var/www/miq/vmdb and unpack the tar file
cd /var/www/miq/vmdb
tar -xvf bz-1293373-tenant-vm-templates.tar
3. Restart EVM

New commit detected on cfme/5.5.z:
https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=e1099090cdd8d9ff00dc6b7ec3c4deaae8ebabea

commit e1099090cdd8d9ff00dc6b7ec3c4deaae8ebabea
Merge: c6a5fc8 aca08a1
Author:     Gregg Tanzillo <gtanzill@redhat.com>
AuthorDate: Fri Jan 8 15:31:04 2016 -0500
Commit:     Gregg Tanzillo <gtanzill@redhat.com>
CommitDate: Fri Jan 8 15:31:04 2016 -0500

    Merge branch 'bz-1292285-addition' into '5.5.z'
    
    Fix condition in to avoid sql 'ambigious' error of tenant_id
    
    (cherry picked from commit c4bee2618950ebf140b8e14a32d73a17198c1e26)
    
    clean cherry pick from https://github.com/ManageIQ/manageiq/pull/6083
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1293373
    
    (part of gitlab.cloudforms.lab.eng.rdu2.redhat.com/cloudforms/cfme/merge_requests/676)
    
    See merge request !689

 app/models/vm_or_template.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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:0159