scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 3924c9a6f1 61ca21c4d7
commit 1b74e7bfc9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/log-dump.sh
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.