Kubernetes Submit Queue 34bf25fe49 Merge pull request #41524 from Random-Liu/fix-cri-kubemark ...

Automatic merge from submit-queue

Generate valid container id in fake docker client.

Fixes https://github.com/kubernetes/kubernetes/issues/41488.

This PR generates valid container id by hashing container name. So that dockershim checkpoint won't report `checkpoint key XXX is not valid` error.

This PR also reverts #41460.

@yujuhong @freehan /cc @kubernetes/sig-node-pr-reviews

2017-02-17 17:45:14 -08:00

..

api

Merge pull request #40915 from tanshanshan/api-groupversion-unittest

2017-02-16 23:15:43 -08:00

apimachinery/tests

…

apis

Revert "Remove alpha provisioning"

2017-02-16 13:53:55 +01:00

auth

…

bootstrap/api

Expose the constants in pkg/controller/bootstrap and add a validate token method

2017-02-14 20:29:23 +02:00

capabilities

Fix comment for method SetForTests

2017-02-14 17:16:49 +08:00

client

Update to use proxy subresource consistently

2017-02-13 22:05:00 -05:00

cloudprovider

Merge pull request #41239 from vmware/e2eTestsUpdate-v2

2017-02-15 20:05:09 -08:00

controller

Merge pull request #41658 from janetkuo/cronjob-panic

2017-02-17 16:38:35 -08:00

conversion

…

credentialprovider

…

features

…

fieldpath

…

fields

…

generated

Merge pull request #40505 from brendandburns/i18n5

2017-02-16 16:45:32 -08:00

hyperkube

…

kubeapiserver

Update bazel

2017-02-15 10:25:15 +01:00

kubectl

Merge pull request #41465 from bruceauyeung/k8s-branch-fix-kubectl-create-configmap-help-messages

2017-02-17 13:56:36 -08:00

kubelet

Merge pull request #41524 from Random-Liu/fix-cri-kubemark

2017-02-17 17:45:14 -08:00

kubemark

Revert #41460.

2017-02-17 14:08:57 -08:00

labels

…

master

Update bazel

2017-02-15 10:25:15 +01:00

metrics

Update to use proxy subresource consistently

2017-02-13 22:05:00 -05:00

probe

…

proxy

Simplify stale-connection detection in kube-proxy

2017-02-15 12:39:49 -08:00

quota

Switch resourcequota controller to shared informers

2017-02-14 12:20:27 -05:00

registry

Merge pull request #41343 from p0lyn0mial/kubectl_get_short_names_from_discovery_api

2017-02-15 09:07:51 -08:00

routes

Update to use proxy subresource consistently

2017-02-13 22:05:00 -05:00

runtime

…

security

Minor comments improvements.

2017-02-13 12:32:58 +01:00

securitycontext

…

serviceaccount

…

ssh

…

types

…

util

generated

2017-02-16 09:25:27 +01:00

version

…

volume

Merge pull request #40726 from humblec/gluster-provclean

2017-02-16 17:05:15 -08:00

watch

…

BUILD

react to informer updates

2017-02-13 09:18:32 -05:00

OWNERS

…