Skip to content

Commit

Permalink
Revert "Merge pull request #17218 from slemrmartin/validate-new-provi…
Browse files Browse the repository at this point in the history
…der-with-proxy"

This reverts commit a4415eb.
  • Loading branch information
simaishi committed Apr 23, 2018
1 parent 611b2a4 commit e0cd69a
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions app/models/manageiq/providers/base_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@ def refresher
end

def http_proxy_uri
self.class.http_proxy_uri
end

def self.http_proxy_uri
VMDB::Util.http_proxy_uri(ems_type.try(:to_sym)) || VMDB::Util.http_proxy_uri
VMDB::Util.http_proxy_uri(emstype.try(:to_sym)) || VMDB::Util.http_proxy_uri
end
end
end

0 comments on commit e0cd69a

Please sign in to comment.