Merge branch 'edge' into reference-cli/patch-2df79ec100181d9fdb26dd3f…

…e542a39391649213
radius-project · Sep 23, 2024 · effe4b9 · effe4b9
2 parents 5d00dfd + 8ff9e32
commit effe4b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/config/en-custom.txt b/.github/config/en-custom.txt
@@ -1286,4 +1286,7 @@ DaprStateStorePropertiesMetadata
 BicepConfigProperties
 BicepConfigPropertiesAuthentication
 RegistrySecretConfig
+DaprConfigurationStorePropertiesMetadata
+DaprConfigurationStoreProperties
+configurationStores
 
diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml
@@ -79,4 +79,4 @@ jobs:
         if: env.NO_CHANGES != 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GH_RAD_CI_BOT_PAT}}
-        run: gh pr create --title "Upmerge to edge" --body "Upmerge to edge (kicked off by @${{ github.triggering_actor }})" --base edge --head $BRANCH_NAME
+        run: gh pr create --title "Upmerge to edge" --body "Upmerge to edge (kicked off by @${{ github.triggering_actor }})" --base edge --head $BRANCH_NAME --signoff