From 98d6a43e1e7c79c1ee739832abb792cc2b2e4ce4 Mon Sep 17 00:00:00 2001 From: Timo Reimann Date: Sat, 18 Feb 2017 22:48:34 +0100 Subject: [PATCH 1/2] Remove .gitattributes file. Makes git diff Glide lock files as text, which is helpful to see changes introduced by a 'glide update' run. --- .gitattributes | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index e8a4935c2..000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -glide.lock binary \ No newline at end of file From 60b3f74be86cdbf4266bbc0caaf2fe3dbb582f25 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 13 Feb 2017 11:56:27 +0100 Subject: [PATCH 2/2] Fix prometheus metrics example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Traefik won’t start correctly if heterogeneous numbers in a toml array. This commit makes all numbers homogene. Signed-off-by: solidnerd --- traefik.sample.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/traefik.sample.toml b/traefik.sample.toml index fc0d6f38f..76bc322a5 100644 --- a/traefik.sample.toml +++ b/traefik.sample.toml @@ -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