Merge branch 'v1.5' into master

2017-12-20 15:47:15 +01:00 · 2017-12-20 15:47:15 +01:00 · 4a7297d05c
commit 4a7297d05c
parent a5335667bb 89a79d0f1b
43 changed files with 667 additions and 198 deletions
--- a/docs/configuration/backends/zookeeper.md
+++ b/docs/configuration/backends/zookeeper.md
@ -27,9 +27,9 @@ watch = true
 # Prefix used for KV store.
 #
 # Optional
-# Default: "/traefik"
+# Default: "traefik"
 #
-prefix = "/traefik"
+prefix = "traefik"

 # Override default configuration template.
 # For advanced users :)