Skip to content

Conversation

@stevsmit
Copy link
Member

@stevsmit stevsmit commented Jan 17, 2025

Version(s):
4.15-4.16

Issue:
https://issues.redhat.com/browse/OCPBUGS-48463

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 17, 2025
@stevsmit stevsmit added this to the Continuous Release milestone Jan 17, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jan 17, 2025

@stevsmit stevsmit force-pushed the ocpbugs-48463-ovnk-live-mig branch from 46c42a3 to c069b14 Compare January 17, 2025 16:07
@openshift-ci
Copy link

openshift-ci bot commented Jan 17, 2025

@stevsmit: 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-sigs/prow repository. I understand the commands that are listed here.

@stevsmit stevsmit added the peer-review-needed Signifies that the peer review team needs to review this PR label Jan 17, 2025
@lpettyjo lpettyjo self-requested a review January 17, 2025 17:13
@lpettyjo lpettyjo added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Jan 17, 2025
Copy link
Contributor

@lpettyjo lpettyjo left a comment

Choose a reason for hiding this comment

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

I notice that you have indicated this applies to 4.15+, but you only have labels for 4.15 and 4.16. Do you need 4.17 and 4.18 labels added?

Otherwise, LGTM!

@lpettyjo lpettyjo 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 labels Jan 17, 2025
@werled
Copy link

werled commented Jan 21, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 21, 2025
@stevsmit stevsmit merged commit 7010289 into openshift:enterprise-4.16 Jan 21, 2025
2 checks passed
@stevsmit
Copy link
Member Author

/cherry-pick enterprise-4.15

@stevsmit
Copy link
Member Author

/cherry-pick enterprise-4.14

@openshift-cherrypick-robot

@stevsmit: #87218 failed to apply on top of branch "enterprise-4.15":

Applying: Fixes command syntax for live migration command
Using index info to reconstruct a base tree...
A	modules/removing-nncp-limited-live-migration.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/removing-nncp-limited-live-migration.adoc deleted in HEAD and modified in Fixes command syntax for live migration command. Version Fixes command syntax for live migration command of modules/removing-nncp-limited-live-migration.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fixes command syntax for live migration command

In response to this:

/cherry-pick 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-sigs/prow repository.

@openshift-cherrypick-robot

@stevsmit: #87218 failed to apply on top of branch "enterprise-4.14":

Applying: Fixes command syntax for live migration command
Using index info to reconstruct a base tree...
A	modules/removing-nncp-limited-live-migration.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/removing-nncp-limited-live-migration.adoc deleted in HEAD and modified in Fixes command syntax for live migration command. Version Fixes command syntax for live migration command of modules/removing-nncp-limited-live-migration.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fixes command syntax for live migration command

In response to this:

/cherry-pick 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-sigs/prow repository.

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

Labels

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/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.

5 participants