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/autogen/gentemplates/gen.go
+++ b/autogen/gentemplates/gen.go
@@ -1116,6 +1116,7 @@ var _templatesKubernetesTmpl = []byte(`[backends]
      entryPoint = "{{ $frontend.Redirect.EntryPoint }}"
      regex = "{{ $frontend.Redirect.Regex }}"
      replacement = "{{ $frontend.Redirect.Replacement }}"
+      permanent = {{ $frontend.Redirect.Permanent }}
    {{end}}

    {{if $frontend.Errors }}