chore(merge-back): 2.52.0 #23109
chore(merge-back): 2.52.0 #23109
Conversation
See [CHANGELOG.v2.md](https://github.com/aws/aws-cdk/compare/v2-release...2.52.0?expand=1#diff-9e3d5c5da890b65a67bf632f93416744d5b76f6eb239e42ab714c7768429ff99) ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws-cdk-automation
added
auto-approve
pr/no-squash
|
|
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
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). |
mergify
bot
dismissed
github-actions[bot]’s stale review
Pull request has been modified.
| @@ -212,22 +217,21 @@ export class Cluster extends Resource implements ICluster { | |||
| this._executeCommandConfiguration = props.executeCommandConfiguration; | |||
| } | |||
|
|
|||
| const cluster = new CfnCluster(this, 'Resource', { | |||
There was a problem hiding this comment.
Are these expected changes? Could this be reverting the changes merged to main after the release branch was created?
There was a problem hiding this comment.
Yes, this change is expected
|
CI is failing because I took the wrong changes in resolving a merge conflict for the CFN spec. Will have that fixed shortly. |
mergify
bot
dismissed
github-actions[bot]’s stale review
Pull request has been modified.
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
|
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). |
See CHANGELOG