Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main to develop #3591

Merged
merged 2 commits into from
May 7, 2024
Merged

Merge main to develop #3591

merged 2 commits into from
May 7, 2024

Conversation

aaythapa
Copy link
Contributor

@aaythapa aaythapa commented May 7, 2024

Issue #, if available

Description of changes

PyPi release script timed out before the bot could create this PR to update the version in our develop branch so created this manually.

Description of how you validated changes

Checklist

Examples?

Please reach out in the comments if you want to add an example. Examples will be
added to sam init through aws/aws-sam-cli-app-templates.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

aaythapa and others added 2 commits May 6, 2024 11:11
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>
Co-authored-by: Xia Zhao <xazhao@amazon.com>
Co-authored-by: aws-sam-cli-bot <46753707+aws-sam-cli-bot@users.noreply.github.com>
@aaythapa aaythapa marked this pull request as ready for review May 7, 2024 21:51
@aaythapa aaythapa requested a review from a team as a code owner May 7, 2024 21:51
@aaythapa aaythapa merged commit 12a3a4c into develop May 7, 2024
7 checks passed
@aaythapa aaythapa deleted the tmp/manual/merge branch May 7, 2024 22:09
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.

4 participants