Merge branch 'v1.5' into master
This commit is contained in:
commit
dc74f76a03
21 changed files with 400 additions and 139 deletions
2
vendor/github.com/containous/flaeg/flaeg.go
generated
vendored
2
vendor/github.com/containous/flaeg/flaeg.go
generated
vendored
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue