SW/traefik
2
0
Fork 1
forked from Ivasoft/traefik
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 'v1.5.1' into master

Browse Source
This commit is contained in:
Fernandez Ludovic
2018-01-29 16:50:16 +01:00
parent 395b1702de 6aac78fc36
commit d426126a92
16 changed files with 319 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/traefik/traefik.go
View File

@@ -142,6 +142,7 @@ func run(globalConfiguration *configuration.GlobalConfiguration, configFile stri
http.DefaultTransport.(*http.Transport).Proxy = http.ProxyFromEnvironment
globalConfiguration.SetEffectiveConfiguration(configFile)
globalConfiguration.ValidateConfiguration()
jsonConf, _ := json.Marshal(globalConfiguration)
log.Infof("Traefik version %s built on %s", version.Version, version.BuildDate)