github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12872 from runningwild/master

Browse Source 
Fix several problems with using rkt on gce
This commit is contained in:
Saad Ali
2015-08-20 15:46:16 -07:00
parent 90bc5565be 80e799fc0c
commit 9b01580946
8 changed files with 55 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/mesos/pkg/executor/service/service.go
View File

@@ -354,6 +354,7 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
kc.OSInterface,
kc.CgroupRoot,
kc.ContainerRuntime,
kc.RktPath,
kc.Mounter,
kc.DockerDaemonContainer,
kc.SystemContainer,