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

Merge pull request #15051 from feiskyer/kubelet/garbage-collection

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-09 02:11:47 -07:00
parent 7b68ff5778 fb04edea3a
commit 538cf72208
10 changed files with 188 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,7 +298,7 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
kubeClient = kc.KubeClient
}
gcPolicy := kubelet.ContainerGCPolicy{
gcPolicy := kubecontainer.ContainerGCPolicy{
MinAge: kc.MinimumGCAge,
MaxPerPodContainer: kc.MaxPerPodContainerCount,
MaxContainers: kc.MaxContainerCount,