Merge pull request #14820 from gmarek/playground

Auto commit by PR queue bot
2015-10-02 07:37:45 -07:00
parent a413fd278f fc79ce347e
commit 6ca515c312
4 changed files with 10 additions and 4 deletions
--- a/contrib/mesos/pkg/executor/service/service.go
+++ b/contrib/mesos/pkg/executor/service/service.go
@@ -320,6 +320,7 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
 		&api.NodeDaemonEndpoints{
 			KubeletEndpoint: api.DaemonEndpoint{Port: int(kc.Port)},
 		},
+		kc.OOMAdjuster,
 	)
 	if err != nil {
 		return nil, nil, err