From 18046b8656327e858835477a734344be97a00b55 Mon Sep 17 00:00:00 2001 From: Lei Jitang Date: Thu, 6 Aug 2015 19:56:51 +0800 Subject: [PATCH] Adapt container settings after verify platform container settings. Signed-off-by: Lei Jitang Upstream-commit: 08b3dc8d9f11e42e1ef6dc7a5b5ee70dd5b55306 Component: engine --- components/engine/daemon/create.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/daemon/create.go b/components/engine/daemon/create.go index 58c40ec267..385618c7b4 100644 --- a/components/engine/daemon/create.go +++ b/components/engine/daemon/create.go @@ -16,8 +16,8 @@ func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hos return "", nil, fmt.Errorf("Config cannot be empty in order to create a container") } - daemon.adaptContainerSettings(hostConfig, adjustCPUShares) warnings, err := daemon.verifyContainerSettings(hostConfig, config) + daemon.adaptContainerSettings(hostConfig, adjustCPUShares) if err != nil { return "", warnings, err }