Kubernetes Submit Queue c3df35df7b Merge pull request #44970 from Random-Liu/fix-stop-container-timeout ...

Automatic merge from submit-queue (batch tested with PRs 44970, 43618)

CRI: Fix StopContainer timeout

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

I verified this PR with the example provided in https://github.com/kubernetes/kubernetes/issues/44956, and now pod deletion will respect grace period timeout:
```
NAME                         READY     STATUS        RESTARTS   AGE
gracefully-terminating-pod   1/1       Terminating   0          6m
```

@dchen1107 @yujuhong @feiskyer /cc @kubernetes/sig-node-bugs

2017-04-26 22:58:11 -07:00

..

api

Merge pull request #41636 from luxas/bump_go_18

2017-04-25 17:56:40 -07:00

apimachinery/tests

autogenerated

2017-04-14 10:40:57 -07:00

apis

Merge pull request #44974 from caesarxuchao/remove-client-go-api-listers

2017-04-26 20:34:13 -07:00

auth

autogenerated

2017-04-14 10:40:57 -07:00

bootstrap/api

autogenerated

2017-04-14 10:40:57 -07:00

capabilities

…

client

Merge pull request #44974 from caesarxuchao/remove-client-go-api-listers

2017-04-26 20:34:13 -07:00

cloudprovider

Merge pull request #44387 from jamiehannaford/fix-port-allocation

2017-04-23 20:50:49 -07:00

controller

Remove misleading error from CronJob controller when it can't find parent UID

2017-04-26 18:57:53 +01:00

conversion

…

credentialprovider

autogenerated

2017-04-14 10:40:57 -07:00

features

autogenerated

2017-04-14 10:40:57 -07:00

fieldpath

autogenerated

2017-04-14 10:40:57 -07:00

fields

…

generated

Merge pull request #44519 from thockin/remove-deprecated-public-ips

2017-04-17 12:11:00 -07:00

hyperkube

…

kubeapiserver

autogenerated

2017-04-14 10:40:57 -07:00

kubectl

Merge pull request #44531 from pwittrock/kubectl-openapi

2017-04-26 16:59:17 -07:00

kubelet

Merge pull request #44970 from Random-Liu/fix-stop-container-timeout

2017-04-26 22:58:11 -07:00

kubemark

autogenerated

2017-04-14 10:40:57 -07:00

labels

…

master

autogenerated

2017-04-14 10:40:57 -07:00

metrics

autogenerated

2017-04-14 10:40:57 -07:00

printers

Merge pull request #44600 from xingzhou/kube-44599

2017-04-25 08:59:07 -07:00

probe

fix various bad tests

2017-04-25 11:23:33 -07:00

proxy

gofmt proxier_test for go1.8.1

2017-04-25 11:23:59 -07:00

quota

autogenerated

2017-04-14 10:40:57 -07:00

registry

Merge pull request #44808 from shiywang/SemanticDeepEqual

2017-04-26 05:48:41 -07:00

routes

autogenerated

2017-04-14 10:40:57 -07:00

runtime

…

security

Merge pull request #41571 from php-coder/fix_comments

2017-04-21 08:34:07 -07:00

securitycontext

…

serviceaccount

autogenerated

2017-04-14 10:40:57 -07:00

ssh

autogenerated

2017-04-14 10:40:57 -07:00

types

…

util

fix various bad tests

2017-04-25 11:23:33 -07:00

version

autogenerated

2017-04-14 10:40:57 -07:00

volume

Merge pull request #44491 from NickrenREN/volume-MountOptionAnnotation

2017-04-25 12:51:39 -07:00

watch

autogenerated

2017-04-14 10:40:57 -07:00

BUILD

…

OWNERS

…