Merge branch 'master' into kubernetes-support-externalname-service
This commit is contained in:
commit
71c7920d0f
2 changed files with 1 additions and 2 deletions
1
.gitattributes
vendored
1
.gitattributes
vendored
|
@ -1 +0,0 @@
|
|||
glide.lock binary
|
|
@ -329,7 +329,7 @@
|
|||
#
|
||||
# To enable Traefik to export internal metrics to Prometheus
|
||||
# [web.metrics.prometheus]
|
||||
# Buckets=[0.1,0.3,1.2,5]
|
||||
# Buckets=[0.1,0.3,1.2,5.0]
|
||||
#
|
||||
|
||||
# To enable basic auth on the webui
|
||||
|
|
Loading…
Reference in a new issue