Merge branch 'v1.5' into master

2017-12-04 13:35:02 +01:00
parent e042ef3f27 3a99c86cb3
commit dc74f76a03
21 changed files with 400 additions and 139 deletions
--- a/vendor/github.com/containous/flaeg/flaeg.go
+++ b/vendor/github.com/containous/flaeg/flaeg.go
@@ -343,7 +343,7 @@ func fillStructRecursive(objValue reflect.Value, defaultPointerValmap map[string
 		contains := false
 		for flag := range valmap {
 			// TODO replace by regexp
-			if strings.Contains(flag, name+".") {
+			if strings.HasPrefix(flag, name+".") {
 				contains = true
 				break
 			}