k8s-merge-robot f4122477c2 Merge pull request #25712 from asalkeld/docker-logpath ...

Automatic merge from submit-queue

Use docker containerInfo.LogPath and not manually constructed path

## Pull Request Guidelines

Since the containerInfo has the LogPath in it, let's use that and
not manually construct the path ourselves. This also makes the code
less prone to breaking if docker change this path.

Fixes #23695

2016-05-25 17:57:59 -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

docker: don't set timeout for image pulling requests

2016-05-23 16:17:49 -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

Ensure that init containers are preserved during pruning

2016-05-24 14:05:55 -04:00

manager.go

Merge pull request #25712 from asalkeld/docker-logpath

2016-05-25 17:57:59 -07:00