k8s-merge-robot 5d6397e9ee Merge pull request #27017 from yujuhong/rm_version ...

Automatic merge from submit-queue

Fix docker api version in kubelet

There are two variables `dockerv110APIVersion` and `dockerV110APIVersion` with
the same purpose, but different values. Remove the incorrect one and fix usage
in the file.

/cc @dchen1107 @Random-Liu

2016-06-12 19:31:06 -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

kubenet masqurade for outbound traffic

2016-06-09 18:43:34 -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

Add unit test for image history cache

2016-05-27 14:49:48 -07:00

fake_manager.go

seccomp: add annotations and test for docker runtime

2016-05-24 12:25:21 -07:00

images_test.go

Add unit test for image history cache

2016-05-27 14:49:48 -07:00

images.go

Cache image history

2016-05-27 14:49:48 -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 image pulling

2016-06-02 10:49:17 -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

move common lables used outside of containr runtime out of dockertools

2016-05-25 23:10:19 -07:00

manager_test.go

Merge pull request #26710 from sttts/sttts-fix-seccomp-annotations

2016-06-11 07:03:50 -07:00

manager.go

Merge pull request #27017 from yujuhong/rm_version

2016-06-12 19:31:06 -07:00