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

fix nil attachment for 1.5 release series #1000

Closed
wants to merge 6 commits into from

Conversation

jaypipes
Copy link
Contributor

This is a manual backport of the changes in
a139509 since there were so many
changes in the awsutils.go file since 1.5.7 that trying to resolve
conflicts was an exercise in futility.

Issue #914

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

anguslees and others added 6 commits April 2, 2020 16:35
Adding cn config as well

(cherry picked from commit a55d865)
This is a manual backport of the changes in
5dfc31c since there were so many
changes in the awsutils.go file since 1.5.7 that trying to resolve
conflicts was an exercise in futility.

Issue aws#914
Copy link
Contributor

@mogren mogren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but should we merge this change into the release-1.5 branch instead?

@jaypipes jaypipes changed the base branch from release-1.5.7 to release-1.5 May 28, 2020 19:14
@jaypipes jaypipes closed this May 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants