Merge current v2.3 branch into master

This commit is contained in:
Jean-Baptiste Doumenjou 2020-10-23 14:29:22 +02:00
commit 4fccde84bd
26 changed files with 634 additions and 423 deletions

View file

@ -340,7 +340,7 @@ Constraints is an expression that Traefik matches against the container's labels
Default rule. (Default: ```Host(`{{ normalize .Name }}`)```)
`--providers.consulcatalog.endpoint.address`:
The address of the Consul server (Default: ```http://127.0.0.1:8500```)
The address of the Consul server (Default: ```127.0.0.1:8500```)
`--providers.consulcatalog.endpoint.datacenter`:
Data center to use. If not provided, the default agent data center is used