diff options
| author | Claire McQuin <mcquin@users.noreply.github.com> | 2014-06-20 12:07:00 -0700 |
|---|---|---|
| committer | Claire McQuin <mcquin@users.noreply.github.com> | 2014-06-20 12:07:00 -0700 |
| commit | f6730f41b46fb9f3ffa5c6fea71d90b5964e779b (patch) | |
| tree | 0999478a04d55d813455bad583245288823784f1 | |
| parent | 4d3501858c394d9efc5d2ee17dd0379c06c94e64 (diff) | |
| parent | 4b86cda95ab350d1f7c1e100ca7dadf7ee2da76d (diff) | |
| download | chef-f6730f41b46fb9f3ffa5c6fea71d90b5964e779b.tar.gz | |
Merge pull request #1526 from opscode/mcquin/windows_service
remove setting proxy environment variables
| -rw-r--r-- | lib/chef/application/windows_service.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb index d1810fc3e8..bea5e9fcdc 100644 --- a/lib/chef/application/windows_service.rb +++ b/lib/chef/application/windows_service.rb @@ -211,7 +211,6 @@ class Chef def reconfigure(startup_parameters=[]) configure_chef startup_parameters configure_logging - configure_proxy_environment_variables Chef::Config[:chef_server_url] = config[:chef_server_url] if config.has_key? :chef_server_url unless Chef::Config[:exception_handlers].any? {|h| Chef::Handler::ErrorReport === h} |