baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'v1.6' into 'v1.7'

Browse source
This commit is contained in:
Fernandez Ludovic 2018-07-12 19:24:11 +02:00
commit c7e008f57a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/configuration/api.md
View file

@ -21,7 +21,7 @@
# Enable debug mode. # Enable debug mode.
# This will install HTTP handlers to expose Go expvars under /debug/vars and # This will install HTTP handlers to expose Go expvars under /debug/vars and
# pprof profiling data under /debug/pprof. # pprof profiling data under /debug/pprof/.
# Additionally, the log level will be set to DEBUG. # Additionally, the log level will be set to DEBUG.
# #
# Optional # Optional

2
docs/configuration/commons.md
View file

@ -18,7 +18,7 @@
# Enable debug mode. # Enable debug mode.
# This will install HTTP handlers to expose Go expvars under /debug/vars and # This will install HTTP handlers to expose Go expvars under /debug/vars and
# pprof profiling data under /debug/pprof. # pprof profiling data under /debug/pprof/.
# The log level will be set to DEBUG unless `logLevel` is specified. # The log level will be set to DEBUG unless `logLevel` is specified.
# #
# Optional # Optional

2
provider/ecs/deprecated_config.go
View file

@ -228,7 +228,7 @@ func getFuncFirstStringValueV1(labelName string, defaultValue string) func(insta
// Deprecated // Deprecated
func getFuncFirstBoolValueV1(labelName string, defaultValue bool) func(instances []ecsInstance) bool { func getFuncFirstBoolValueV1(labelName string, defaultValue bool) func(instances []ecsInstance) bool {
return func(instances []ecsInstance) bool { return func(instances []ecsInstance) bool {
if len(instances) < 0 { if len(instances) == 0 {
return defaultValue return defaultValue
} }
return getBoolValueV1(instances[0], labelName, defaultValue) return getBoolValueV1(instances[0], labelName, defaultValue)