k8s-merge-robot 4ea034c284 Merge pull request #25896 from yujuhong/inspect_error ...

Automatic merge from submit-queue

kubelet: Don't attempt to apply the oom score if container exited already

Containers could terminate before kubelet applies the oom score. This is normal
and the function should not error out.

This addresses #25844 partially.

/cc @smarterclayton @Random-Liu

2016-05-20 06:22:57 -07:00

..

container_gc_test.go

Refactor InspectContainer.

2016-04-14 17:05:46 -07:00

container_gc.go

Refactor StartContainer, StopContainer and RemoveContainer.

2016-04-14 17:05:46 -07:00

convert_test.go

Merge pull request #24630 from euank/redundant-created

2016-05-08 16:21:05 -07:00

convert.go

Merge pull request #24630 from euank/redundant-created

2016-05-08 16:21:05 -07:00

docker_test.go

rkt: Add tests for GarbageCollect().

2016-05-13 15:13:52 -07:00

docker.go

Cleanup the code with new engine-api

2016-04-29 13:34:38 -07:00

exec.go

Refactor CreateExec, StartExec and InspectExec.

2016-04-17 12:58:47 -07:00

fake_docker_client.go

Cleanup the code with new engine-api

2016-04-29 13:34:38 -07:00

fake_manager.go

Use expiration cache for version check

2016-04-27 05:42:50 -04:00

images_test.go

Track image storage usage for docker containers

2016-04-25 16:00:34 -07:00

images.go

Track image storage usage for docker containers

2016-04-25 16:00:34 -07:00

instrumented_docker.go

1) Add docker operation timeout metrics.

2016-05-06 10:53:13 -07:00

kube_docker_client.go

Add timeout for all docker operation.

2016-05-06 10:53:13 -07:00

labels_test.go

Set Docker custom metric label for cAdvisor if custom metric volume is mounted

2016-02-05 12:00:02 +01:00

labels.go

Set Docker custom metric label for cAdvisor if custom metric volume is mounted

2016-02-05 12:00:02 +01:00

manager_test.go

Merge pull request #24921 from feiskyer/merge-exec

2016-05-15 02:58:15 -07:00

manager.go

Merge pull request #25896 from yujuhong/inspect_error

2016-05-20 06:22:57 -07:00