Merge tag 'v1.6.0-rc6' into master

This commit is contained in:
Fernandez Ludovic 2018-04-18 10:13:22 +02:00
commit e6ce61fdf0
48 changed files with 1115 additions and 472 deletions

View file

@ -55,7 +55,7 @@ domain = "mesos.localhost"
# - "1": previous template version (must be used only with older custom templates, see "filename")
# - "2": current template version (must be used to force template version when "filename" is used)
#
# templateVersion = "2"
# templateVersion = 2
# TLS client configuration. https://golang.org/pkg/crypto/tls/#Config
#