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 remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5

Browse source 
Conflicts:
    salt/modules/ps.py
    tests/unit/modules/ps_test.py
This commit is contained in:
Colton Myers 2015-06-26 14:02:46 -06:00
commit 4980fd547b
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/cloud/__init__.py
View file

@ -1339,6 +1339,9 @@ class Cloud(object):
except IOError:
main_cloud_config = {}
if main_cloud_config is None:
main_cloud_config = {}
profile_details = self.opts['profiles'][profile]
alias, driver = profile_details['provider'].split(':')
mapped_providers = self.map_providers_parallel()