New commit detected on cfme/5.4.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=e9e2957f5cb70c9a6df00ddffa19b9d69f1dac18 commit e9e2957f5cb70c9a6df00ddffa19b9d69f1dac18 Merge: 9ebb102 5b71bc5 Author: Dan Clarizio <dclarizi> AuthorDate: Tue Aug 11 18:14:40 2015 -0400 Commit: Dan Clarizio <dclarizi> CommitDate: Tue Aug 11 18:14:40 2015 -0400 Merge branch '54z_bz_1246655' into '5.4.z' Recovered "Smartproxy Affinity" tab in Configuration. Recovered "Smartproxy Affinity" tab in Configuration explorer that was removed in https://github.com/ManageIQ/manageiq/pull/1531 along with all Smartproxy related code from UI in commit SHA: dd539dccd0289914df55ad81b7b977372dfcc647 https://bugzilla.redhat.com/show_bug.cgi?id=1246655 https://bugzilla.redhat.com/show_bug.cgi?id=1252476 @dclarizio please review. Had to make some changes manually to all_tabs view since tabs on upstream have been converted to patternfly tabs. Also had to make minor change to toolbar code in application_helper as that code has been moved out to a different module on upstream. original PR: https://github.com/ManageIQ/manageiq/pull/3783 See merge request !218 vmdb/app/assets/javascripts/miq_dynatree.js | 9 + .../controllers/ops_controller/settings/common.rb | 132 +++++++++++- vmdb/app/helpers/application_helper.rb | 2 +- vmdb/app/views/ops/_all_tabs.html.haml | 4 + .../_settings_smartproxy_affinity_tab.html.haml | 3 + vmdb/app/views/ops/_smartproxy_affinity.html.haml | 19 ++ .../ops_controller/settings/common_spec.rb | 236 +++++++++++++++++++++ vmdb/spec/routing/ops_routing_spec.rb | 1 + 8 files changed, 404 insertions(+), 2 deletions(-)
New commit detected on cfme/5.4.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=5b71bc5bee55b4484db24cde4123f5f6e37d6eea commit 5b71bc5bee55b4484db24cde4123f5f6e37d6eea Author: Harpreet Kataria <hkataria> AuthorDate: Tue Aug 11 10:59:22 2015 -0400 Commit: Harpreet Kataria <hkataria> CommitDate: Tue Aug 11 17:00:01 2015 -0400 Recovered "Smartproxy Affinity" tab in Configuration. Recovered "Smartproxy Affinity" tab in Configuration explorer that was removed in https://github.com/ManageIQ/manageiq/pull/1531 along with all Smartproxy related code from UI in commit SHA: dd539dccd0289914df55ad81b7b977372dfcc647 https://bugzilla.redhat.com/show_bug.cgi?id=1246655 https://bugzilla.redhat.com/show_bug.cgi?id=1252476 vmdb/app/assets/javascripts/miq_dynatree.js | 9 + .../controllers/ops_controller/settings/common.rb | 132 +++++++++++- vmdb/app/helpers/application_helper.rb | 2 +- vmdb/app/views/ops/_all_tabs.html.haml | 4 + .../_settings_smartproxy_affinity_tab.html.haml | 3 + vmdb/app/views/ops/_smartproxy_affinity.html.haml | 19 ++ .../ops_controller/settings/common_spec.rb | 236 +++++++++++++++++++++ vmdb/spec/routing/ops_routing_spec.rb | 1 + 8 files changed, 404 insertions(+), 2 deletions(-) create mode 100644 vmdb/app/views/ops/_settings_smartproxy_affinity_tab.html.haml create mode 100644 vmdb/app/views/ops/_smartproxy_affinity.html.haml create mode 100644 vmdb/spec/controllers/ops_controller/settings/common_spec.rb
Good to go. Verified and working fine in 5.4.2.0.20150820153254_83e434d
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-1744.html