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

OADP-3234: Fix Broken-Link Creating a Restore CR in index.adoc - cher… #69233

Conversation

anarnold97
Copy link
Contributor

@anarnold97 anarnold97 commented Dec 11, 2023

Cherrypick for 4.11

The only link is the missing space at the end of line 77

JIra

Fixing broken link in Backing up and restoring applications: You restore application backups by creating a Restore (CR). See [Creating a Restore CR](https://docs.openshift.com/container-platform/4.11/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-creating-backup-cr-doc.html#backing-up-applications).

OCP version

  • OCP 4.11 → branch/enterprise-4.11

Error from cherrypick

Applying: OADP-3234: Fix Broken-Link Creating a Restore CR in index.adoc
Using index info to reconstruct a base tree...
M	backup_and_restore/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging backup_and_restore/index.adoc
CONFLICT (content): Merge conflict in backup_and_restore/index.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 OADP-3234: Fix Broken-Link Creating a Restore CR in index.adoc
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".

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 11, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 11, 2023

@anarnold97: This pull request references OADP-3234 which is a valid jira issue.

In response to this:

…ry pick for 4.11

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 11, 2023
@anarnold97
Copy link
Contributor Author

/label OADP

@openshift-ci openshift-ci bot added the OADP Label for all OADP PRs label Dec 11, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 11, 2023

@anarnold97: This pull request references OADP-3234 which is a valid jira issue.

In response to this:

JIra

Fixing broken link in Backing up and restoring applications: You restore application backups by creating a Restore (CR). See [Creating a Restore CR](https://docs.openshift.com/container-platform/4.11/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-creating-backup-cr-doc.html#backing-up-applications).

OCP version

  • OCP 4.11 → branch/enterprise-4.11

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

openshift-ci-robot commented Dec 11, 2023

@anarnold97: This pull request references OADP-3234 which is a valid jira issue.

In response to this:

Cherrypick for 4.11

JIra

Fixing broken link in Backing up and restoring applications: You restore application backups by creating a Restore (CR). See [Creating a Restore CR](https://docs.openshift.com/container-platform/4.11/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-creating-backup-cr-doc.html#backing-up-applications).

OCP version

  • OCP 4.11 → branch/enterprise-4.11

Error from cherrypick

Applying: [OADP-3234](https://issues.redhat.com//browse/OADP-3234): Fix Broken-Link Creating a Restore CR in index.adoc
Using index info to reconstruct a base tree...
M	backup_and_restore/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging backup_and_restore/index.adoc
CONFLICT (content): Merge conflict in backup_and_restore/index.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 [OADP-3234](https://issues.redhat.com//browse/OADP-3234): Fix Broken-Link Creating a Restore CR in index.adoc
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".

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.

…ry pick for 4.11

Signed-off-by: Andy Arnold <anarnold@redhat.com>
@anarnold97 anarnold97 force-pushed the OADP-3234-Fix-Broken-Link-Creating-Restore-CR-CherryPick-for-4-11 branch from 2c84ded to cd288c6 Compare December 11, 2023 23:49
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 11, 2023

@anarnold97: This pull request references OADP-3234 which is a valid jira issue.

In response to this:

Cherrypick for 4.11

The only link is the missing space at the end of line 77

JIra

Fixing broken link in Backing up and restoring applications: You restore application backups by creating a Restore (CR). See [Creating a Restore CR](https://docs.openshift.com/container-platform/4.11/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-creating-backup-cr-doc.html#backing-up-applications).

OCP version

  • OCP 4.11 → branch/enterprise-4.11

Error from cherrypick

Applying: [OADP-3234](https://issues.redhat.com//browse/OADP-3234): Fix Broken-Link Creating a Restore CR in index.adoc
Using index info to reconstruct a base tree...
M	backup_and_restore/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging backup_and_restore/index.adoc
CONFLICT (content): Merge conflict in backup_and_restore/index.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 [OADP-3234](https://issues.redhat.com//browse/OADP-3234): Fix Broken-Link Creating a Restore CR in index.adoc
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".

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.

@anarnold97 anarnold97 closed this Dec 12, 2023
@anarnold97 anarnold97 reopened this Dec 12, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 12, 2023

@anarnold97: This pull request references OADP-3234 which is a valid jira issue.

In response to this:

Cherrypick for 4.11

The only link is the missing space at the end of line 77

JIra

Fixing broken link in Backing up and restoring applications: You restore application backups by creating a Restore (CR). See [Creating a Restore CR](https://docs.openshift.com/container-platform/4.11/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-creating-backup-cr-doc.html#backing-up-applications).

OCP version

  • OCP 4.11 → branch/enterprise-4.11

Error from cherrypick

Applying: [OADP-3234](https://issues.redhat.com//browse/OADP-3234): Fix Broken-Link Creating a Restore CR in index.adoc
Using index info to reconstruct a base tree...
M	backup_and_restore/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging backup_and_restore/index.adoc
CONFLICT (content): Merge conflict in backup_and_restore/index.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 [OADP-3234](https://issues.redhat.com//browse/OADP-3234): Fix Broken-Link Creating a Restore CR in index.adoc
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".

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.

@anarnold97
Copy link
Contributor Author

/label peer-review-needed

@anarnold97 anarnold97 closed this Dec 12, 2023
@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Dec 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. OADP Label for all OADP PRs peer-review-needed Signifies that the peer review team needs to review 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.

None yet

2 participants