Merge 'v1.3.5'

2017-08-01 19:32:44 +02:00
parent 94f922cd28 413ed62933
commit d456c2ce6a
23 changed files with 1833 additions and 138 deletions
--- a/integration/integration_test.go
+++ b/integration/integration_test.go
@@ -38,6 +38,7 @@ func init() {
 	check.Suite(&AcmeSuite{})
 	check.Suite(&DynamoDBSuite{})
 	check.Suite(&ErrorPagesSuite{})
+	check.Suite(&WebsocketSuite{})
 }

 var traefikBinary = "../dist/traefik"