Merge 'v1.6.2' into master

2018-05-22 19:14:34 +02:00
parent 3c8c5ebb96 e3671cbb04
commit e2a5d4f83e
49 changed files with 630 additions and 500 deletions
--- a/server/server.go
+++ b/server/server.go
@@ -1398,7 +1398,7 @@ func configureBackends(backends map[string]*types.Backend) {
 				}
 			}
 		} else {
-			log.Debugf("Validation of load balancer method for backend %s failed: %s. Using default method wrr.", backendName, err)
+			log.Debugf("Backend %s: %v", backendName, err)

 			var stickiness *types.Stickiness
 			if backend.LoadBalancer != nil {