1
0
Fork 0

Merge 'v1.5.1' into master

This commit is contained in:
Fernandez Ludovic 2018-01-29 16:50:16 +01:00
commit d426126a92
16 changed files with 319 additions and 343 deletions

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)