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.61.1 #10038

Merged
merged 5 commits into from
Aug 28, 2020
Merged

chore(merge-back): 1.61.1 #10038

merged 5 commits into from
Aug 28, 2020

Conversation

aws-cdk-automation
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation commented Aug 28, 2020

See CHANGELOG

shivlaks and others added 3 commits August 28, 2020 11:26
We were reading the wrong key when reading version source for template
resources. This prevented upgrade of bootstrap as the new version was
being incorrectly returned as `0`.

Fixes #10016

----

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

----

*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 the pr/no-squash This PR should be merged instead of squash-merging it label Aug 28, 2020
RomainMuller
RomainMuller previously approved these changes Aug 28, 2020
@mergify
Copy link
Contributor

mergify bot commented Aug 28, 2020

Thank you for contributing! Your pull request will be updated from master and then merged automatically without squashing (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot dismissed RomainMuller’s stale review August 28, 2020 12:36

Pull request has been modified.

@mergify
Copy link
Contributor

mergify bot commented Aug 28, 2020

Thank you for contributing! Your pull request will be updated from master and then merged automatically 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: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: 59b0c12
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify
Copy link
Contributor

mergify bot commented Aug 28, 2020

Thank you for contributing! Your pull request will be updated from master and then merged automatically without squashing (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit af41534 into master Aug 28, 2020
@mergify mergify bot deleted the merge-back/1.61.1 branch August 28, 2020 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

3 participants