Skip to content

Integrate upstream changes from develop#92

Draft
carole-lavillonniere wants to merge 11 commits intolocalstackfrom
drg-507-integrate-new-lambda-rie-upstream-changes-from-2026-02-12
Draft

Integrate upstream changes from develop#92
carole-lavillonniere wants to merge 11 commits intolocalstackfrom
drg-507-integrate-new-lambda-rie-upstream-changes-from-2026-02-12

Conversation

@carole-lavillonniere
Copy link
Copy Markdown

@carole-lavillonniere carole-lavillonniere commented Apr 8, 2026

  • Merges upstream AWS changes from develop into localstack branch following this guide
  • Resolves all merge conflicts preserving LocalStack customizations while integrating upstream additions

mbfreder and others added 11 commits August 8, 2025 14:45
* chore(deps): Update go-chi to v5.2.2
* Add support for multi-tenancy
---------
Co-authored-by: Chengjun Li <>
* ci: scope down permissions for release.yml

* ci: scope down permissions for integ-tests.yml

* ci: scope down permissions for check-binaries.yml
* Update from upstream - 2026-03-18

* Update from upstream - 2026-03-18

* Update from upstream - 2026-03-18

* Update from upstream - 2026-03-19

* Update from upstream - 2026-03-19

* Potential fix for code scanning alert no. 7: Workflow does not contain permissions

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* Update from upstream - 2026-03-27

* Update from upstream - 2026-03-30

---------

Co-authored-by: lambda-tooling+rie <lambda-tooling+rie@amazon.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
* Update from upstream - 2026-03-18

* Update from upstream - 2026-03-18

* Update from upstream - 2026-03-18

* Update from upstream - 2026-03-19

* Update from upstream - 2026-03-19

* Potential fix for code scanning alert no. 7: Workflow does not contain permissions

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* Update from upstream - 2026-03-27

* Update from upstream - 2026-03-30

* Update from upstream - 2026-04-01

---------

Co-authored-by: lambda-tooling+rie <lambda-tooling+rie@amazon.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
@carole-lavillonniere carole-lavillonniere changed the title Integrate upstream changes from develop (2026-02-12) Integrate upstream changes from develop Apr 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants