valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #32408 from toddtomkinson/fix_fetch_uri_mismatch

Browse Source 
remove "duplicate" fetch array when updating a marathon app
This commit is contained in:
Nicole Thomas 2016-04-07 09:05:03 -06:00
commit b80be476e7
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/modules/marathon.py
View File

@ -98,6 +98,9 @@ def update_app(id, config):
if 'id' not in config: if 'id' not in config:
config['id'] = id config['id'] = id
config.pop('version', None) config.pop('version', None)
# mirror marathon-ui handling for uris deprecation (see
# mesosphere/marathon-ui#594 for more details)
config.pop('fetch', None)
data = json.dumps(config) data = json.dumps(config)
try: try:
response = salt.utils.http.query( response = salt.utils.http.query(