Merge branch '1.5.0-rc5' into master

2018-01-15 17:27:37 +01:00
parent 2618aef008 fe426f6fb2
commit 89d90de7d8
74 changed files with 914 additions and 385 deletions
--- a/integration/etcd_test.go
+++ b/integration/etcd_test.go
@@ -419,7 +419,7 @@ func (s *EtcdSuite) TestCommandStoreConfig(c *check.C) {
 		"/traefik/loglevel":                 "DEBUG",
 		"/traefik/defaultentrypoints/0":     "http",
 		"/traefik/entrypoints/http/address": ":8000",
-		"/traefik/web/address":              ":8080",
+		"/traefik/api/entrypoint":           "traefik",
 		"/traefik/etcd/endpoint":            etcdHost + ":4001",
 	}