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 merge conflict and apply SME feedback #26070

Merged
merged 1 commit into from
Oct 2, 2020

Conversation

bobfuru
Copy link
Contributor

@bobfuru bobfuru commented Oct 1, 2020

This PR incorporates feedback from CoreOS SMEs, compiled from separate PRs:

This work also relates to #25709. It's likely that 25709 will be merged first, hopefully without resulting merge conflicts. 🤞

@bobfuru bobfuru added this to the Next Release milestone Oct 1, 2020
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 1, 2020
@openshift-docs-preview-bot

The preview will be available shortly at:

@bobfuru bobfuru requested review from miabbott and bgilbert October 2, 2020 00:00
@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 2, 2020

@miabbott and @bgilbert PTAL and let me know if you have changes, or if this looks good to you, thanks!

Copy link
Member

@miabbott miabbott left a comment

Choose a reason for hiding this comment

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

LGTM! I don't think I saw anything to prevent merging; fixes can be done in a follow-up

@bobfuru bobfuru merged commit bbb271c into openshift:master Oct 2, 2020
@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 2, 2020

/cherrypick enterprise-4.6

@bobfuru bobfuru deleted the COREOS-updates branch October 2, 2020 22:12
@openshift-cherrypick-robot

@bobfuru: #26070 failed to apply on top of branch "enterprise-4.6":

Applying: Fix merge conflict and apply SME feedback
Using index info to reconstruct a base tree...
M	modules/installation-user-infra-machines-iso.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-user-infra-machines-iso.adoc
CONFLICT (content): Merge conflict in modules/installation-user-infra-machines-iso.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix merge conflict and apply SME feedback
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.6

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.

@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 2, 2020

Fix for 4.6 CP merge conflict in #26093

@bobfuru
Copy link
Contributor Author

bobfuru commented Oct 14, 2020

Thanks, @bgilbert - I have addressed your most recent comments in #26442 to combine with your additional feedback. Please double-check in either PR and let me know if these changes are as you intended or not.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.6 size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants