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 pull request #32116 from ticosax/memory_swap-default-from-container

Browse source 
Obtain default value of `memory_swap` from the container.
This commit is contained in:
Nicole Thomas 2016-03-24 09:56:54 -06:00
commit 294177f428
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/dockerng.py
View file

@ -400,7 +400,7 @@ VALID_CREATE_OPTS = {
'memory_swap': {
'api_name': 'memswap_limit',
'path': 'HostConfig:MemorySwap',
'default': 0,
'get_default_from_container': True,
},
'mac_address': {
'validator': 'string',