commit f5c70c5b75238804be39f048eef6aad9cc0cd166
author Justin Cormack <justin.cormack@docker.com> Fri Nov 03 13:59:51 2017 +0000
committer GitHub <noreply@github.com> Fri Nov 03 13:59:51 2017 +0000
tree 26802b47c1ec34fee599a3858b651a4f21dfd807
parent 7801be2eee987013cc20148d0335f42bec618835
parent f0b44881b5d43b18871dee2ecc2bb313046038f6

Merge pull request #35365 from Microsoft/jjh/removeduplicateoomscoreadj

Remove duplicate redundant setting of OOMScoreAdj in OCI spec

daemon/oci_linux.go

diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go
index 905e20c..2c5d94d 100644
--- a/daemon/oci_linux.go
+++ b/daemon/oci_linux.go
@@ -755,7 +755,6 @@
 	if err := setResources(&s, c.HostConfig.Resources); err != nil {
 		return nil, fmt.Errorf("linux runtime spec resources: %v", err)
 	}
-	s.Process.OOMScoreAdj = &c.HostConfig.OomScoreAdj
 	s.Linux.Sysctl = c.HostConfig.Sysctls
 
 	p := s.Linux.CgroupsPath