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-3341: quick formatting fix in oadp-installing-dpa-1-3.adoc #70151

Merged

Conversation

anarnold97
Copy link
Contributor

@anarnold97 anarnold97 commented Jan 11, 2024

Jira

OCP version

  • OCP 4.15 → branch/enterprise-4.15

Preview

QE review

I do not think QE review is required as it is two small formatting errors

Signed-off-by: Andy Arnold <anarnold@redhat.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 11, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 11, 2024

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

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

Jira

  • [OADP-3341(https://issues.redhat.com/browse/OADP-3341)

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 11, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 11, 2024

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

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

Jira

  • [OADP-3341(https://issues.redhat.com/browse/OADP-3341)

OCP version

  • OCP 4.15 → branch/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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 11, 2024

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

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

Jira

OCP version

  • OCP 4.15 → branch/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 openshift-eng/jira-lifecycle-plugin repository.

@anarnold97
Copy link
Contributor Author

/label oadp

@openshift-ci openshift-ci bot added the OADP Label for all OADP PRs label Jan 11, 2024
@ocpdocs-previewbot
Copy link

🤖 Thu Jan 11 22:11:24 - Prow CI generated the docs preview: https://70151--ocpdocs-pr.netlify.app

Copy link

openshift-ci bot commented Jan 11, 2024

@anarnold97: 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.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 11, 2024

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

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

Jira

OCP version

  • OCP 4.15 → branch/enterprise-4.15

Preview

QE review

I do not think QE review is required as it is two small formatting errors

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 openshift-eng/jira-lifecycle-plugin repository.

@anarnold97
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 Jan 11, 2024
@tmalove
Copy link
Contributor

tmalove commented Jan 11, 2024

/remove-label peer-review-needed
/label peer-review-in-progress

@openshift-ci openshift-ci bot 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 11, 2024
@tmalove
Copy link
Contributor

tmalove commented Jan 11, 2024

/remove-label peer-review-in-progress
/label peer-review-done
/LGTM

@openshift-ci openshift-ci bot 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 11, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 11, 2024
@anarnold97
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 Jan 11, 2024
@bscott-rh bscott-rh added merge-review-in-progress Signifies that the merge review team is reviewing this PR branch/enterprise-4.15 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 Jan 12, 2024
@bscott-rh bscott-rh added this to the Planned for 4.15 GA milestone Jan 12, 2024
@bscott-rh
Copy link
Contributor

merge review LGTM

@bscott-rh bscott-rh merged commit 51b84e4 into openshift:main Jan 12, 2024
2 checks passed
@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.15

@openshift-cherrypick-robot

@bscott-rh: #70151 failed to apply on top of branch "enterprise-4.15":

Applying: OADP-3341: quick formatting fix in oadp-installing-dpa-1-3.adoc
Using index info to reconstruct a base tree...
M	modules/oadp-installing-dpa-1-3.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/oadp-installing-dpa-1-3.adoc
CONFLICT (content): Merge conflict in modules/oadp-installing-dpa-1-3.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-3341: quick formatting fix in oadp-installing-dpa-1-3.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".

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.

@anarnold97
Copy link
Contributor Author

@bscott-rh - thanks, looks like this has been fixed in another PR

I ran a diff-check and the only difference is that there is an extra blank line at the bottom of the doc

Again, thanks

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.15

@openshift-cherrypick-robot

@bscott-rh: new pull request created: #70184

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.15 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. OADP Label for all OADP PRs 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.

None yet

6 participants