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 #43268 from rallytime/bp-43237

Browse source 
Back-port #43237 to 2017.7
This commit is contained in:
Mike Place 2017-09-01 12:17:12 -06:00 • committed by GitHub
commit 367668a0a3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/aws.py
View file

@ -392,7 +392,7 @@ def query(params=None, setname=None, requesturl=None, location=None,
service_url = prov_dict.get('service_url', 'amazonaws.com')
if not location:
location = get_location(opts, provider)
location = get_location(opts, prov_dict)
if endpoint is None:
if not requesturl: