Merge branch v2.2 into v2.3

2020-09-04 21:06:11 +02:00
parent 235d1d655d 2d1a973ee5
commit 3678bd5a93
44 changed files with 1292 additions and 1357 deletions
--- a/docs/content/reference/dynamic-configuration/file.yaml
+++ b/docs/content/reference/dynamic-configuration/file.yaml
@@ -222,7 +222,7 @@ http:
      inFlightReq:
        amount: 42
        sourceCriterion:
-          ipstrategy:
+          ipStrategy:
            depth: 42
            excludedIPs:
            - foobar
@@ -263,7 +263,7 @@ http:
        period: 42
        burst: 42
        sourceCriterion:
-          ipstrategy:
+          ipStrategy:
            depth: 42
            excludedIPs:
            - foobar