Merge branch 'v1.15' into 4422_ext

.github/workflows/link_validation.yaml

@@ -13,7 +13,7 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     env: 
-      PYTHON_VER: 3.7
+      PYTHON_VER: 3.12
     steps:
       - uses: actions/checkout@v2
       - name: Check Microsoft URLs do not pin localized versions
@@ -27,7 +27,7 @@ jobs:
             exit 1
           fi
       - name: Set up Python ${{ env.PYTHON_VER }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_VER }}
       - name: Install dependencies

daprdocs/content/en/operations/resiliency/policies.md

@@ -96,7 +96,7 @@ spec:
         policy: constant
         duration: 5s
         maxRetries: 3
-        matches:
+        matching:
           httpStatusCodes: "429,500-599" # retry the HTTP status codes in this range. All others are not retried. 
           gRPCStatusCodes: "1-4,8-11,13,14" # retry gRPC status codes in these ranges and separate single codes.
 ```

daprdocs/content/en/reference/resource-specs/resiliency-schema.md

@@ -32,6 +32,9 @@ spec:
         duration: <REPLACE-WITH-VALUE>
         maxInterval: <REPLACE-WITH-VALUE>
         maxRetries: <REPLACE-WITH-VALUE>
+        matching:
+          httpStatusCodes: <REPLACE-WITH-VALUE>
+          gRPCStatusCodes: <REPLACE-WITH-VALUE>
     circuitBreakers:
       circuitBreakerName: # Replace with any unique name
         maxRequests: <REPLACE-WITH-VALUE>