Merge branch 'master' into kubernetes-support-externalname-service

This commit is contained in:
Regner Blok-Andersen 2017-02-21 10:02:34 -08:00 committed by GitHub
commit 71c7920d0f
2 changed files with 1 additions and 2 deletions

1
.gitattributes vendored
View file

@ -1 +0,0 @@
glide.lock binary

View file

@ -329,7 +329,7 @@
# #
# To enable Traefik to export internal metrics to Prometheus # To enable Traefik to export internal metrics to Prometheus
# [web.metrics.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 # To enable basic auth on the webui