Merge pull request #13780 from smarterclayton/pod_logs

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-21 17:02:47 -07:00
32 changed files with 768 additions and 103 deletions

View File

@@ -1,3 +1,4 @@
accept-hosts
accept-paths
account-for-pod-resources
@@ -143,6 +144,7 @@ kube-master
label-columns
last-release-pr
legacy-userspace-proxy
limit-bytes
load-balancer-ip
log-flush-frequency
long-running-request-regexp
@@ -252,6 +254,8 @@ service-node-port-range
service-node-ports
service-sync-period
session-affinity
since-seconds
since-time
show-all
shutdown-fd
shutdown-fifo
@@ -287,3 +291,4 @@ www-prefix
retry_time
file_content_in_loop
cpu-cfs-quota