diff --git a/.github/config/en-custom.txt b/.github/config/en-custom.txt index 6a3f1c370..fb8d2ff04 100644 --- 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 index 69e1cd82b..63d422bde 100644 --- 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