homelab/traefik
1
0
Fork 0
Code Activity

Merge current v2.3 branch into master

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
pkg/middlewares/accesslog/logger_formatters_test.go
View file

@ -83,8 +83,8 @@ func TestCommonLogFormatter_Format(t *testing.T) {
},
}
// Set timezone to Alaska to have a constant behavior
os.Setenv("TZ", "US/Alaska")
// Set timezone to Etc/GMT+9 to have a constant behavior
os.Setenv("TZ", "Etc/GMT+9")
for _, test := range testCases {
test := test

2
pkg/provider/consulcatalog/consul_catalog.go
View file

@ -66,7 +66,7 @@ type EndpointConfig struct {
// SetDefaults sets the default values.
func (c *EndpointConfig) SetDefaults() {
c.Address = "http://127.0.0.1:8500"
c.Address = "127.0.0.1:8500"
}
// EndpointHTTPAuthConfig holds configurations of the authentication.