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): 1.163.2 #21132

Merged
merged 5 commits into from
Jul 14, 2022
Merged

chore(merge-back): 1.163.2 #21132

merged 5 commits into from
Jul 14, 2022

Conversation

aws-cdk-automation
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation commented Jul 14, 2022

See CHANGELOG

mergify bot and others added 4 commits July 13, 2022 16:25
… `ResponseURL` to user function (backport #21117) (#21123)

This is an automatic backport of pull request #21117 done by [Mergify](https://mergify.com).
Cherry-pick of ddfca48 has failed:
```
On branch mergify/bp/v1-main/pr-21117
Your branch is up to date with 'origin/v1-main'.

You are currently cherry-picking commit ddfca48.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   packages/@aws-cdk/custom-resources/test/provider-framework/runtime.test.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packages/@aws-cdk/custom-resources/lib/provider-framework/runtime/framework.ts

```


To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>
@aws-cdk-automation aws-cdk-automation added auto-approve pr/no-squash This PR should be merged instead of squash-merging it labels Jul 14, 2022
@gitpod-io
Copy link

gitpod-io bot commented Jul 14, 2022

@github-actions github-actions bot added the p2 label Jul 14, 2022
@aws-cdk-automation aws-cdk-automation requested a review from a team July 14, 2022 00:58
@mergify
Copy link
Contributor

mergify bot commented Jul 14, 2022

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: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: 4b3263a
  • 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 e1b631d into v1-main Jul 14, 2022
@mergify mergify bot deleted the merge-back/1.163.2 branch July 14, 2022 02:25
@mergify
Copy link
Contributor

mergify bot commented Jul 14, 2022

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).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-approve p2 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.

2 participants