resolve merge conflicts into master#2137

Merged

GarrettBeatty merged 13 commits intodevfrom

gcbeatty/mergeconflicts

Sep 16, 2025

Commits on Jun 4, 2025

Merge pull request #2082 from aws/dev
philasmar
authored

Commits on Jun 11, 2025

chore: Pinned to v1.6.0 of aws-github-ops/handle-stale-discussions so that closed GitHub discussions are not auto-reopened. (#2085)
ashishdhingra
authored

Commits on Jun 12, 2025

Merge pull request #2088 from aws/dev
philasmar
authored

Commits on Jun 25, 2025

Merge branch 'dev'
aws-sdk-dotnet-automation
committed

Commits on Jul 11, 2025

Synd dev and master (#2105)

authored

Commits on Jul 14, 2025

Merge branch 'dev'
aws-sdk-dotnet-automation
committed

Commits on Jul 15, 2025

Merge branch 'dev'
aws-sdk-dotnet-automation
committed

Commits on Jul 18, 2025

Merge pull request #2116 from aws/dev
philasmar
authored

Commits on Aug 1, 2025

Merge branch 'dev'
aws-sdk-dotnet-automation
committed

Commits on Aug 14, 2025

Merge pull request #2124 from aws/dev
philasmar
authored

Commits on Sep 10, 2025

Merge pull request #2131 from aws/dev
philasmar
authored

Commits on Sep 12, 2025

auto update lambda runtime images (#2112) (#2133)
GarrettBeatty
authored

Commits on Sep 16, 2025

Merge branch 'master' into dev
GarrettBeatty
committed