http://gitlab.cloudforms.lab.eng.rdu2.redhat.com/cloudforms/cfme/merge_requests/624
New commit detected on cfme/5.5.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=77677d5ef2f0858bf81cb9f291ea5f39ed8b1cf5 commit 77677d5ef2f0858bf81cb9f291ea5f39ed8b1cf5 Merge: 1b03fa6 0d2a48a Author: Dan Clarizio <dclarizi> AuthorDate: Mon Jan 4 16:03:45 2016 -0500 Commit: Dan Clarizio <dclarizi> CommitDate: Mon Jan 4 16:03:45 2016 -0500 Merge branch 'bz-1291724-cloud-tenant-in-conditions-ds' into '5.5.z' Include reflections of descendant classes when building model details for report ing and expression editors - Enabled only for Vm and Host models - Enables inclusion of cloud tenants under an openstack VM in reports and expressions - Enables inclusion of cloud networks under an openstack Host https://bugzilla.redhat.com/show_bug.cgi?id=1291724 Cherry-picked from https://github.com/ManageIQ/manageiq/pull/5506 Cherry-pick was not clean. There were conflicts in config/locales/en.yml which I resolved. See merge request !624 app/models/host.rb | 4 ++++ app/models/miq_expression.rb | 9 +++++++-- app/models/vm.rb | 4 ++++ config/locales/en.yml | 3 +++ spec/models/miq_expression/miq_expression_spec.rb | 17 +++++++++++++++++ 5 files changed, 35 insertions(+), 2 deletions(-)