Merge current v2.3 branch into master

2020-10-23 14:29:22 +02:00
parent edb15a9346 ea459e9af0
commit 4fccde84bd
26 changed files with 634 additions and 423 deletions
--- a/pkg/middlewares/accesslog/logger_formatters_test.go
+++ b/pkg/middlewares/accesslog/logger_formatters_test.go
@@ -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