Skip to content

chore(merge-back): 1.137.0#18155

Merged
mergify[bot] merged 3 commits intomasterfrom
merge-back/1.137.0
Dec 23, 2021
Merged

chore(merge-back): 1.137.0#18155
mergify[bot] merged 3 commits intomasterfrom
merge-back/1.137.0

Conversation

@aws-cdk-automation
Copy link
Copy Markdown
Collaborator

@aws-cdk-automation aws-cdk-automation commented Dec 23, 2021

See CHANGELOG

rix0rrr and others added 2 commits December 23, 2021 10:47
The example as declared in this doc block was part of the
parameter, not of the function.

Change to an `@example` declaration to associate the example with
the right scope.

----

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

(cherry picked from commit 1c111fc)
…18149)

This is an automatic backport of pull request #18132 done by [Mergify](https://mergify.com).


---


<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 pr/auto-approve Notifies the GH action to auto-approve this PR pr/no-squash This PR should be merged instead of squash-merging it labels Dec 23, 2021
@gitpod-io
Copy link
Copy Markdown

gitpod-io bot commented Dec 23, 2021

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Dec 23, 2021

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 mergify bot merged commit 8c5894a into master Dec 23, 2021
@mergify mergify bot deleted the merge-back/1.137.0 branch December 23, 2021 15:21
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Dec 23, 2021

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
Copy Markdown
Collaborator Author

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: 9875824
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/auto-approve Notifies the GH action to auto-approve this PR 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