Merge pull request #23994 from mml/docker-supervisor-logs

Automatic merge from submit-queue

Also collect docker supervisor logs.
This commit is contained in:
k8s-merge-robot 2016-04-17 13:46:36 -07:00
commit 1b74e7bfc9

View File

@ -83,7 +83,7 @@ readonly aws_logfiles="cloud-init-output"
readonly gce_logfiles="startupscript"
readonly common_logfiles="kern"
readonly initd_logfiles="docker"
readonly supervisord_logfiles="kubelet supervisor/supervisord supervisor/kubelet-stdout supervisor/kubelet-stderr"
readonly supervisord_logfiles="kubelet supervisor/supervisord supervisor/kubelet-stdout supervisor/kubelet-stderr supervisor/docker-stdout supervisor/docker-stderr"
# Limit the number of concurrent node connections so that we don't run out of
# file descriptors for large clusters.