Skip to content

Remove conditionals to readd missing abstract #72512

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Mar 6, 2024
Merged

Remove conditionals to readd missing abstract #72512

merged 1 commit into from
Mar 6, 2024

Conversation

SNiemann15
Copy link
Contributor

@SNiemann15 SNiemann15 commented Mar 4, 2024 •
edited
Loading

Version(s): 4.12+

Issue:

Link to docs preview:

QE review:

  • [NA] QE has approved this change.

Additional information: Post GA follow up from discussion here: #71071 (comment)

@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 4, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Mar 4, 2024 •
edited
Loading

🤖 Tue Mar 05 16:51:22 - Prow CI generated the docs preview:
https://72512--ocpdocs-pr.netlify.app

mjpytlak
mjpytlak reviewed Mar 5, 2024
View reviewed changes
modules/installation-initializing-manual.adoc Outdated
ifdef::vsphere-upi,restricted-upi[]
For user-provisioned installations of {product-title}, you manually generate your installation configuration file.
Installing the cluster requires that you manually create the installation configuration file.
//Made this update as part of feedback in PR3961. tl;dr Simply state you have to create the config file, instead of creating a number of conditions to explain why.
Copy link
Contributor

Choose a reason for hiding this comment

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

@SNiemann15 I added this comment a while ago. Feel free to remove it as part of this work.

@SNiemann15 SNiemann15 force-pushed the followup_pr71071_add_abstract branch from 6a0d7bc to ac98351 Compare March 5, 2024 16:41
@SNiemann15 SNiemann15 force-pushed the followup_pr71071_add_abstract branch from ac98351 to 390f68b Compare March 5, 2024 16:44
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Mar 5, 2024

@SNiemann15: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@SNiemann15
Copy link
Contributor Author

/label peer-review-needed

1 similar comment
@SNiemann15
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Mar 6, 2024
@mburke5678 mburke5678 added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Mar 6, 2024
@mburke5678
Copy link
Contributor

/lgtm

@mburke5678 mburke5678 added this to the Continuous Release milestone Mar 6, 2024
@mburke5678 mburke5678 added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR peer-review-needed Signifies that the peer review team needs to review this PR labels Mar 6, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 6, 2024
@SNiemann15
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Mar 6, 2024
@mburke5678 mburke5678 added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Mar 6, 2024
@mburke5678 mburke5678 merged commit fbcf9e1 into openshift:main Mar 6, 2024
@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.12

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.13

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.14

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.15

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.16

@openshift-cherrypick-robot
Copy link

@mburke5678: #72512 failed to apply on top of branch "enterprise-4.12":

Applying: Remove conditionals to readd missing abstract
Using index info to reconstruct a base tree...
M	modules/installation-initializing-manual.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-initializing-manual.adoc
CONFLICT (content): Merge conflict in modules/installation-initializing-manual.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 Remove conditionals to readd missing abstract
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.12

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
Copy link

@mburke5678: #72512 failed to apply on top of branch "enterprise-4.13":

Applying: Remove conditionals to readd missing abstract
Using index info to reconstruct a base tree...
M	modules/installation-initializing-manual.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-initializing-manual.adoc
CONFLICT (content): Merge conflict in modules/installation-initializing-manual.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 Remove conditionals to readd missing abstract
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.13

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
Copy link

@mburke5678: #72512 failed to apply on top of branch "enterprise-4.14":

Applying: Remove conditionals to readd missing abstract
Using index info to reconstruct a base tree...
M	modules/installation-initializing-manual.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-initializing-manual.adoc
CONFLICT (content): Merge conflict in modules/installation-initializing-manual.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 Remove conditionals to readd missing abstract
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.14

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
Copy link

@mburke5678: new pull request created: #72777

In response to this:

/cherrypick enterprise-4.15

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.

This was referenced Mar 6, 2024
Merged
Merged
@openshift-cherrypick-robot
Copy link

@mburke5678: new pull request created: #72778

In response to this:

/cherrypick enterprise-4.16

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.

This was referenced Mar 7, 2024
Merged
Merged
@SNiemann15 SNiemann15 mentioned this pull request Mar 7, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mjpytlak mjpytlak mjpytlak left review comments

Assignees

@mburke5678 mburke5678

Labels
branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 lgtm Indicates that a PR is ready to be merged. peer-review-done Signifies that the peer review team has reviewed this PR size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.
5 participants
@SNiemann15 @ocpdocs-previewbot @mburke5678 @openshift-cherrypick-robot @mjpytlak