Merge pull request #25707 from thaJeztah/move-sysctls-to-correct-api-version

Move sysctls to correct API version
Upstream-commit: 4105cff4d8d5bb55661944286ceee03f9c5c36ee
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2016-08-15 20:29:51 +02:00
committed by GitHub
2 changed files with 1 additions and 1 deletions

View File

@ -200,7 +200,6 @@ Create a container
"RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
"NetworkMode": "bridge",
"Devices": [],
"Sysctls": { "net.ipv4.ip_forward": "1" },
"Ulimits": [{}],
"LogConfig": { "Type": "json-file", "Config": {} },
"SecurityOpt": [],

View File

@ -327,6 +327,7 @@ Create a container
"RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
"NetworkMode": "bridge",
"Devices": [],
"Sysctls": { "net.ipv4.ip_forward": "1" },
"Ulimits": [{}],
"LogConfig": { "Type": "json-file", "Config": {} },
"SecurityOpt": [],