Merge 'v1.4.0-rc4' into master

2017-10-02 17:18:24 +02:00
parent 1c98a9ad3e f8d36fda28
commit cf508b6d48
54 changed files with 2903 additions and 541 deletions
--- a/integration/fixtures/access_log_config.toml
+++ b/integration/fixtures/access_log_config.toml
@@ -9,6 +9,8 @@ defaultEntryPoints = ["http"]
  [entryPoints.http]
  address = ":8000"

+checkNewVersion = false
+
 ################################################################
 # Web configuration backend
 ################################################################
--- a/integration/fixtures/log_rotation_config.toml
+++ b/integration/fixtures/log_rotation_config.toml
@@ -9,6 +9,8 @@ defaultEntryPoints = ["http"]
  [entryPoints.http]
  address = ":8000"

+checkNewVersion = false
+
 ################################################################
 # Web configuration backend
 ################################################################
--- a/integration/fixtures/traefik_log_config.toml
+++ b/integration/fixtures/traefik_log_config.toml
@@ -4,8 +4,10 @@
 traefikLogsFile = "traefik.log"
 accessLogsFile = "access.log"
 logLevel = "DEBUG"
-checkNewVersion = false
 defaultEntryPoints = ["http"]
+
+checkNewVersion = false
+
 [entryPoints]
  [entryPoints.http]
  address = ":8000"
--- a/integration/fixtures/websocket/config.toml
+++ b/integration/fixtures/websocket/config.toml
@@ -21,4 +21,4 @@ logLevel = "DEBUG"
  [frontends.frontend1]
  backend = "backend1"
    [frontends.frontend1.routes.test_1]
-    rule = "Path:/ws"
+    rule = "PathPrefix:/ws"