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

chore(merge-back): 2.147.1 #30651

Merged
merged 7 commits into from
Jun 26, 2024
Merged

chore(merge-back): 2.147.1 #30651

merged 7 commits into from
Jun 26, 2024

Conversation

aws-cdk-automation
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation commented Jun 24, 2024

See CHANGELOG

samson-keung and others added 3 commits June 21, 2024 09:43
…time with imported `delegatedZone` (#30440)" (#30606)

This reverts commit a3d9b10.

### Issue # (if applicable)

Closes #30600.

### Reason for this change

Reverting #30440 so that `cdk synth` succeed when using imported `delegatedZone`

### Description of changes

Removed the `throw new Error()`

### Description of how you validated changes



### Checklist
- [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md)

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
@aws-cdk-automation aws-cdk-automation added auto-approve pr/no-squash This PR should be merged instead of squash-merging it labels Jun 24, 2024
@aws-cdk-automation aws-cdk-automation requested a review from a team June 24, 2024 19:54
@github-actions github-actions bot added the p2 label Jun 24, 2024
@aws-cdk-automation aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Jun 24, 2024
Copy link
Contributor

mergify bot commented Jun 24, 2024

Thank you for contributing! Your pull request will be automatically updated and merged without squashing (do not update manually, and be sure to allow changes to be pushed to your fork).

@TheRealAmazonKendra
Copy link
Contributor

@Mergifyio update

Copy link
Contributor

mergify bot commented Jun 26, 2024

update

✅ Branch has been successfully updated

@TheRealAmazonKendra
Copy link
Contributor

@Mergifyio update

Copy link
Contributor

mergify bot commented Jun 26, 2024

update

✅ Branch has been successfully updated

Copy link
Contributor

mergify bot commented Jun 26, 2024

Thank you for contributing! Your pull request will be automatically updated and merged without squashing (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator Author

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: afc4a0f
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify mergify bot merged commit 07cb5b0 into main Jun 26, 2024
12 checks passed
@mergify mergify bot deleted the merge-back/2.147.1 branch June 26, 2024 06:24
Copy link
Contributor

mergify bot commented Jun 26, 2024

Thank you for contributing! Your pull request will be automatically updated and merged without squashing (do not update manually, and be sure to allow changes to be pushed to your fork).

This was referenced Jul 1, 2024
@aws-cdk-automation
Copy link
Collaborator Author

Comments on closed issues and PRs are hard for our team to see. If you need help, please open a new issue that references this one.

@aws aws locked as resolved and limited conversation to collaborators Jul 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
auto-approve p2 pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. pr/no-squash This PR should be merged instead of squash-merging it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants