Kubernetes Submit Queue 5d54c55710 Merge pull request #30212 from feiskyer/kuberuntime-flag ...

Automatic merge from submit-queue

Kubelet: add --container-runtime-endpoint and --image-service-endpoint

Flag `--container-runtime-endpoint` (overrides `--container-runtime`) is introduced to identify the unix socket file of the remote runtime service. And flag `--image-service-endpoint` is introduced to identify the unix socket file of the image service.

This PR is part of #28789 Milestone 0. 

CC @yujuhong @Random-Liu

2016-08-21 12:03:10 -07:00

..

.gitattributes

Mark known-flags to merge via union.

2016-06-08 15:59:35 -07:00

exceptions.txt

Merge pull request #31057 from johscheuer/fix-kube-controller-manager.manifest

2016-08-20 13:00:38 -07:00

excluded-flags.txt

Move kubemark, skew, upgrade, leak logic into hack/e2e.go

2016-08-09 14:04:19 -07:00

known-flags.txt

Merge pull request #30212 from feiskyer/kuberuntime-flag

2016-08-21 12:03:10 -07:00