Skip to content

Commit 57f93d2

Browse files
GarrettBeattyphilasmarashishdhingraaws-sdk-dotnet-automationdependabot[bot]
authored
resolve merge conflicts into master (#2137)
* chore: Pinned to v1.6.0 of aws-github-ops/handle-stale-discussions so that closed GitHub discussions are not auto-reopened. (#2085) * Synd dev and master (#2105) * Bump github/codeql-action from 3.28.19 to 3.29.2 (#2098) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.19 to 3.29.2. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@fca7ace...181d5ee) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 3.29.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump aws-actions/aws-secretsmanager-get-secrets from 2.0.9 to 2.0.10 (#2099) Bumps [aws-actions/aws-secretsmanager-get-secrets](https://github.com/aws-actions/aws-secretsmanager-get-secrets) from 2.0.9 to 2.0.10. - [Release notes](https://github.com/aws-actions/aws-secretsmanager-get-secrets/releases) - [Commits](aws-actions/aws-secretsmanager-get-secrets@5e19ff3...a9a7eb4) --- updated-dependencies: - dependency-name: aws-actions/aws-secretsmanager-get-secrets dependency-version: 2.0.10 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: ASP.NET Core version update in Dockerfiles (#2103) Co-authored-by: aws-sdk-dotnet-automation <github-aws-sdk-dotnet-automation@amazon.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: aws-sdk-dotnet-automation <github-aws-sdk-dotnet-automation@amazon.com> * auto update lambda runtime images (#2112) (#2133) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Philippe El Asmar <53088140+philasmar@users.noreply.github.com> Co-authored-by: Ashish Dhingra <67916761+ashishdhingra@users.noreply.github.com> Co-authored-by: aws-sdk-dotnet-automation <github-aws-sdk-dotnet-automation@amazon.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 13ecad3 commit 57f93d2

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)