Merge pull request #33680 from rallytime/bp-32942

Back-port #32942 to 2016.3
saltstack · Jun 1, 2016 · c725854 · c725854
2 parents 9571dad + 09751ec
commit c725854
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/salt/utils/http.py b/salt/utils/http.py
@@ -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: