http://gitlab.cloudforms.lab.eng.rdu2.redhat.com/cloudforms/cfme/merge_requests/750
New commit detected on cfme/5.5.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=68b7cd747de5a5700ba8a4b180e09d33c426c8df commit 68b7cd747de5a5700ba8a4b180e09d33c426c8df Author: Harpreet Kataria <hkataria> AuthorDate: Mon Jan 25 10:56:27 2016 -0500 Commit: Harpreet Kataria <hkataria> CommitDate: Tue Jan 26 17:45:38 2016 -0500 Changes to set catalog for Catalog Bundle even if display is not set https://bugzilla.redhat.com/show_bug.cgi?id=1301190 https://bugzilla.redhat.com/show_bug.cgi?id=1302015 (cherry picked from commit 204f3b8) app/controllers/catalog_controller.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
New commit detected on cfme/5.5.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=e09198fded167f5f1b7891616ca52763b8730cc1 commit e09198fded167f5f1b7891616ca52763b8730cc1 Merge: e4e2fab 637cf49 Author: Dan Clarizio <dclarizi> AuthorDate: Tue Jan 26 19:01:21 2016 -0500 Commit: Dan Clarizio <dclarizi> CommitDate: Tue Jan 26 19:01:21 2016 -0500 Merge branch '55z_pr_6326' into '5.5.z' Catalog bundle fix @dclarizi please review, this is a clean cherry-pick for https://github.com/ManageIQ/manageiq/pull/6326 https://bugzilla.redhat.com/show_bug.cgi?id=1302015 See merge request !750 app/controllers/catalog_controller.rb | 25 ++++++++++--------------- spec/controllers/catalog_controller_spec.rb | 25 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 15 deletions(-)
Verified in 5.5.2.4.20160127105142_395c086
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
New commit detected on cfme/5.5.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=a7c5d806df828a3b1e78f5107ab6d9ec0727b1ce commit a7c5d806df828a3b1e78f5107ab6d9ec0727b1ce Author: Harpreet Kataria <hkataria> AuthorDate: Mon Jan 25 10:56:27 2016 -0500 Commit: Milan Zazrivec <mzazrivec> CommitDate: Mon Feb 1 14:03:28 2016 +0100 Changes to set catalog for Catalog Bundle even if display is not set https://bugzilla.redhat.com/show_bug.cgi?id=1301190 https://bugzilla.redhat.com/show_bug.cgi?id=1302015 (cherry picked from commit 204f3b8) app/controllers/catalog_controller.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)