Skip to content

Conversation

@sagidlow
Copy link
Contributor

@sagidlow sagidlow commented Mar 2, 2021

Applies to 4.4+
BZ Link: https://bugzilla.redhat.com/show_bug.cgi?id=1851320
QE verified that the change must be metadata.json. Please verify the changes: @wjiangjay

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 2, 2021
@netlify
Copy link

netlify bot commented Mar 2, 2021

Deploy preview for osdocs ready!

Built with commit cf2a137

https://deploy-preview-29988--osdocs.netlify.app

@codyhoag codyhoag self-requested a review March 2, 2021 15:48
Copy link
Contributor

@codyhoag codyhoag left a comment

Choose a reason for hiding this comment

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

LGTM!

@ghost
Copy link

ghost commented Mar 3, 2021

LGTM

@codyhoag codyhoag merged commit 4f7382e into openshift:master Mar 3, 2021
@codyhoag
Copy link
Contributor

codyhoag commented Mar 3, 2021

/cherrypick enterprise-4.8

@codyhoag
Copy link
Contributor

codyhoag commented Mar 3, 2021

/cherrypick enterprise-4.7

@codyhoag
Copy link
Contributor

codyhoag commented Mar 3, 2021

/cherrypick enterprise-4.6

@openshift-cherrypick-robot

@codyhoag: new pull request created: #30059

Details

In response to this:

/cherrypick enterprise-4.8

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.

@codyhoag
Copy link
Contributor

codyhoag commented Mar 3, 2021

/cherrypick enterprise-4.5

@openshift-cherrypick-robot

@codyhoag: new pull request created: #30060

Details

In response to this:

/cherrypick enterprise-4.7

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.

@openshift-cherrypick-robot

@codyhoag: new pull request created: #30061

Details

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.

@openshift-cherrypick-robot

@codyhoag: #29988 failed to apply on top of branch "enterprise-4.5":

Applying: BZ1851320 - updated metadata file extension
Using index info to reconstruct a base tree...
M	modules/installation-osp-creating-bootstrap-machine.adoc
M	modules/installation-osp-creating-compute-machines.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-osp-creating-compute-machines.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-creating-compute-machines.adoc
Auto-merging modules/installation-osp-creating-bootstrap-machine.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-creating-bootstrap-machine.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 BZ1851320 - updated metadata file extension
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".

Details

In response to this:

/cherrypick enterprise-4.5

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants