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

Merge pull request #21855 from rallytime/bp-21841

Browse Source 
Backport #21841 to 2014.7
This commit is contained in:
Nicole Thomas 2015-03-20 13:15:33 -06:00
commit 54b32db78d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/fileserver/gitfs.py
View File

@ -663,7 +663,7 @@ def init():
# default to empty strings. If any of them are defined and the gitfs
# provider is not one that supports auth, then error out and do not
# proceed.
override_params = PER_REMOTE_PARAMS
override_params = copy.deepcopy(PER_REMOTE_PARAMS)
global_auth_params = [
'gitfs_{0}'.format(x) for x in AUTH_PARAMS
if __opts__['gitfs_{0}'.format(x)]
@ -733,7 +733,7 @@ def init():
'information.'.format(
param,
repo_url,
', '.join(PER_REMOTE_PARAMS)
', '.join(override_params)
)
)
per_remote_errors = True