Merge remote-tracking branch 'upstream/v2.1' into v2.2

2020-03-18 18:12:24 +01:00 · 2020-03-18 18:12:24 +01:00 · 2b28607a4e
commit 2b28607a4e
parent 44221fba49 683d5d5a48
10 changed files with 41 additions and 10 deletions
--- a/docs/content/reference/static-configuration/file.yaml
+++ b/docs/content/reference/static-configuration/file.yaml
@ -37,6 +37,8 @@ entryPoints:
        entryPoint:
          to: foobar
          scheme: foobar
+          permanent: true
+          priority: 42
      middlewares:
      - foobar
      - foobar