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

Fix incorrect merge conflict resolution

Browse source 
This was fixed in develop (at the time, now 2018.3), but it doesn't look
like this was fixed in 2017.7.
This commit is contained in:
Erik Johnson 2018-02-28 15:59:08 -06:00
parent 8c50ff32bd
commit 68000b7211
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/pillar/git_pillar.py
View file

@ -492,12 +492,6 @@ except ImportError:
PER_REMOTE_OVERRIDES = ('env', 'root', 'ssl_verify', 'refspecs')
PER_REMOTE_ONLY = ('name', 'mountpoint')
# Fall back to default per-remote-only. This isn't technically needed since
# salt.utils.gitfs.GitBase.init_remotes() will default to
# salt.utils.gitfs.PER_REMOTE_ONLY for this value, so this is mainly for
# runners and other modules that import salt.pillar.git_pillar.
PER_REMOTE_ONLY = salt.utils.gitfs.PER_REMOTE_ONLY
# Set up logging
log = logging.getLogger(__name__)