-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit 42d1d7c
authored
This is an automatic backport of pull request #19320 done by [Mergify](https://mergify.com).
Cherry-pick of b0346a4 has failed:
```
On branch mergify/bp/main/pr-19320
Your branch is up to date with 'origin/main'.
You are currently cherry-picking commit b0346a4.
(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/aws-ec2/lib/instance-types.ts
modified: packages/@aws-cdk/aws-ec2/lib/machine-image.ts
modified: packages/@aws-cdk/aws-ec2/lib/port.ts
modified: packages/@aws-cdk/aws-ec2/lib/util.ts
modified: packages/@aws-cdk/aws-ec2/test/instance.test.ts
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: packages/@aws-cdk/aws-ec2/lib/vpc.ts
both modified: packages/@aws-cdk/aws-ec2/lib/windows-versions.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>
1 parent a3c1a5d commit 42d1d7cCopy full SHA for 42d1d7c
File tree
7 files changed
+316
-115
lines changedFilter options
- packages/@aws-cdk/aws-ec2
- lib
- test
7 files changed
+316
-115
lines changed
0 commit comments