Fix merge conflict and apply SME feedback#26070
Merged
bobfuru merged 1 commit intoopenshift:masterfrom Oct 2, 2020
Merged
Conversation
|
The preview will be available shortly at: |
Contributor
Author
miabbott
reviewed
Oct 2, 2020
miabbott
approved these changes
Oct 2, 2020
Member
miabbott
left a comment
There was a problem hiding this comment.
LGTM! I don't think I saw anything to prevent merging; fixes can be done in a follow-up
6d61b69 to
195ef0d
Compare
Contributor
Author
|
/cherrypick enterprise-4.6 |
|
@bobfuru: #26070 failed to apply on top of branch "enterprise-4.6": DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Contributor
Author
|
Fix for 4.6 CP merge conflict in #26093 |
bgilbert
reviewed
Oct 13, 2020
Contributor
Author
This was referenced Feb 3, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR incorporates feedback from CoreOS SMEs, compiled from separate PRs:
coreos.live.rootfs_url.This work also relates to #25709. It's likely that 25709 will be merged first, hopefully without resulting merge conflicts. 🤞