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 syntax error leftover from incomplete merge-conflict resolution

Browse source
This commit is contained in:
rallytime 2017-02-22 16:51:01 -07:00
parent 7b9b3f700d
commit c52cecd856
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/modules/dockerng.py
View file

@ -583,6 +583,7 @@ VALID_CREATE_OPTS = {
'Type': None,
'Config': {},
}
},
'ulimits': {
'path': 'HostConfig:Ulimits',
'min_docker': (1, 6, 0),