saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #33680 from rallytime/bp-32942

Browse source 
Back-port #32942 to 2016.3
This commit is contained in:
Mike Place 2016-06-01 15:14:19 -07:00
commit c725854596
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/utils/http.py
View file

@ -132,6 +132,7 @@ def query(url,
handle=False,
agent=USERAGENT,
hide_fields=None,
raise_error=True,
**kwargs):
'''
Query a resource, and decode the return data
@ -479,6 +480,7 @@ def query(url,
proxy_port=proxy_port,
proxy_username=proxy_username,
proxy_password=proxy_password,
raise_error=raise_error,
**req_kwargs
)
else:
@ -498,6 +500,7 @@ def query(url,
proxy_port=proxy_port,
proxy_username=proxy_username,
proxy_password=proxy_password,
raise_error=raise_error,
**req_kwargs
)
except tornado.httpclient.HTTPError as exc: