Skip to content

chore(merge-back): 1.138.1#18310

Merged
mergify[bot] merged 5 commits intomasterfrom
merge-back/1.138.1
Jan 7, 2022
Merged

chore(merge-back): 1.138.1#18310
mergify[bot] merged 5 commits intomasterfrom
merge-back/1.138.1

Conversation

@aws-cdk-automation
Copy link
Copy Markdown
Collaborator

@aws-cdk-automation aws-cdk-automation commented Jan 7, 2022

See CHANGELOG

otaviomacedo and others added 4 commits January 7, 2022 12:40
…' folder (#18306)

Changes the asset structure from:

```
├── asset.993168cfa75b295eeea55bf603340284b9be46ebc079e4965f2c16f5470efda5
│   └── asset-input
│       ├── __init__.py
│       └── app.py
```

to:

```
├── asset.993168cfa75b295eeea55bf603340284b9be46ebc079e4965f2c16f5470efda5
│   ├── __init__.py
│   └── app.py
```

Fixes #18301.

----

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

*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 Jan 7, 2022
@gitpod-io
Copy link
Copy Markdown

gitpod-io bot commented Jan 7, 2022

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jan 7, 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
Copy Markdown
Collaborator Author

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: a56bfc4
  • 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 4fb0309 into master Jan 7, 2022
@mergify mergify bot deleted the merge-back/1.138.1 branch January 7, 2022 18:04
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jan 7, 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 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