Skip to content

GH#23621 - Move PTP topic#28977

Merged
jboxman merged 1 commit intoopenshift:masterfrom
jboxman-rh:gh-23621
Feb 1, 2021
Merged

GH#23621 - Move PTP topic#28977
jboxman merged 1 commit intoopenshift:masterfrom
jboxman-rh:gh-23621

Conversation

@jboxman
Copy link
Copy Markdown
Contributor

@jboxman jboxman commented Jan 29, 2021 •
edited
Loading

@jboxman jboxman self-assigned this Jan 29, 2021
@openshift-ci-robot openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 29, 2021
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 29, 2021
@jboxman jboxman added branch/enterprise-4.4 branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jan 29, 2021
@jboxman jboxman added this to the Next Release milestone Jan 29, 2021
@netlify
Copy link
Copy Markdown

netlify Bot commented Jan 29, 2021

Deploy preview for osdocs ready!

Built with commit 171c5d05646a600e2f3d2e5846856a172e3ff9fc

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

@jboxman jboxman removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 29, 2021
bobfuru
bobfuru reviewed Jan 29, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@bobfuru bobfuru left a comment

Choose a reason for hiding this comment

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

A few minor nits but otherwise LGTM.

Comment thread networking/configuring-ptp.adoc Outdated
Comment thread networking/configuring-ptp.adoc Outdated
Comment thread networking/configuring-ptp.adoc Outdated
@bobfuru bobfuru added the peer-review-done Signifies that the peer review team has reviewed this PR label Jan 29, 2021
@netlify
Copy link
Copy Markdown

netlify Bot commented Jan 29, 2021 •
edited
Loading

Deploy preview for osdocs ready!

Built with commit 3cb986c

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

@jboxman
Copy link
Copy Markdown
Contributor Author

jboxman commented Feb 1, 2021

@bobfuru thanks!

@jboxman jboxman merged commit 1a3b923 into openshift:master Feb 1, 2021
@jboxman jboxman deleted the gh-23621 branch February 1, 2021 23:09
@jboxman
Copy link
Copy Markdown
Contributor Author

jboxman commented Feb 1, 2021 •
edited by openshift-ci-robot
Loading

/cherry-pick enterprise-4.7

@jboxman
Copy link
Copy Markdown
Contributor Author

jboxman commented Feb 1, 2021 •
edited by openshift-ci-robot
Loading

/cherry-pick enterprise-4.6

@jboxman
Copy link
Copy Markdown
Contributor Author

jboxman commented Feb 1, 2021 •
edited by openshift-ci-robot
Loading

/cherry-pick enterprise-4.5

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Feb 1, 2021 •
edited by openshift-ci-robot
Loading

@jboxman: #28977 failed to apply on top of branch "enterprise-4.7":

Applying: Move PTP topic
Using index info to reconstruct a base tree...
M	_topic_map.yml
Falling back to patching base and 3-way merge...
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move PTP topic
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:

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

@jboxman
Copy link
Copy Markdown
Contributor Author

jboxman commented Feb 1, 2021 •
edited by openshift-ci-robot
Loading

/cherry-pick enterprise-4.4

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Feb 1, 2021 •
edited by openshift-ci-robot
Loading

@jboxman: #28977 failed to apply on top of branch "enterprise-4.6":

Applying: Move PTP topic
Using index info to reconstruct a base tree...
M	_topic_map.yml
Falling back to patching base and 3-way merge...
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move PTP topic
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:

/cherry-pick 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
Copy link
Copy Markdown

openshift-cherrypick-robot commented Feb 1, 2021 •
edited by openshift-ci-robot
Loading

@jboxman: #28977 failed to apply on top of branch "enterprise-4.5":

Applying: Move PTP topic
Using index info to reconstruct a base tree...
M	_topic_map.yml
Falling back to patching base and 3-way merge...
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move PTP topic
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:

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

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Feb 1, 2021 •
edited by openshift-ci-robot
Loading

@jboxman: #28977 failed to apply on top of branch "enterprise-4.4":

Applying: Move PTP topic
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	networking/multiple_networks/configuring-ptp.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/configuring-ptp.adoc
CONFLICT (content): Merge conflict in networking/configuring-ptp.adoc
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move PTP topic
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:

/cherry-pick enterprise-4.4

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.

@jboxman jboxman mentioned this pull request Feb 2, 2021
Merged
This was referenced Feb 2, 2021
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@bobfuru bobfuru bobfuru left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@jboxman jboxman

Labels

branch/enterprise-4.4 branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 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

Next Release

Development

Successfully merging this pull request may close these issues.

4 participants

@jboxman @openshift-cherrypick-robot @bobfuru @openshift-ci-robot