From 9b042e66178d3a9d1c15646395582cce2b7b507e Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Thu, 24 Dec 2015 15:28:56 +0800 Subject: [PATCH] Remove duplicated OomKilldisable It's in Resources, but wrongly added back to HostConfig in https://github.com/docker/docker/pull/18762 Signed-off-by: Qiang Huang Upstream-commit: 2e02077e9f9608e1f5aa462be2bb88655763a113 Component: engine --- components/engine/api/types/container/host_config.go | 1 - 1 file changed, 1 deletion(-) diff --git a/components/engine/api/types/container/host_config.go b/components/engine/api/types/container/host_config.go index 1e849bfa9f..96f73e1170 100644 --- a/components/engine/api/types/container/host_config.go +++ b/components/engine/api/types/container/host_config.go @@ -209,7 +209,6 @@ type HostConfig struct { IpcMode IpcMode // IPC namespace to use for the container Links []string // List of links (in the name:alias form) OomScoreAdj int // Container preference for OOM-killing - OomKillDisable bool // Whether to disable OOM Killer or not PidMode PidMode // PID namespace to use for the container Privileged bool // Is the container in privileged mode PublishAllPorts bool // Should docker publish all exposed port for the container