Merge branch v2.2 into v2.3

2020-09-04 21:06:11 +02:00
parent 235d1d655d 2d1a973ee5
commit 3678bd5a93
44 changed files with 1292 additions and 1357 deletions
--- a/pkg/config/static/static_config.go
+++ b/pkg/config/static/static_config.go
@@ -32,7 +32,7 @@ import (
 	"github.com/containous/traefik/v2/pkg/tracing/zipkin"
 	"github.com/containous/traefik/v2/pkg/types"
 	assetfs "github.com/elazarl/go-bindata-assetfs"
-	legolog "github.com/go-acme/lego/v3/log"
+	legolog "github.com/go-acme/lego/v4/log"
 	"github.com/sirupsen/logrus"
 	ptypes "github.com/traefik/paerser/types"
 )