Skip to content

Ensure procedure steps are sequential #20617

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

Merged
merged 1 commit into from
Mar 21, 2020

Conversation

jboxman
Copy link
Contributor

@jboxman jboxman commented Mar 20, 2020

The procedures were missing some + in critical places.

@jboxman jboxman added this to the Next Release milestone Mar 20, 2020
@jboxman jboxman self-assigned this Mar 20, 2020
@jboxman jboxman added the peer-review-needed Signifies that the peer review team needs to review this PR label Mar 20, 2020
@openshift-docs-preview-bot

The preview will be available shortly at:

@ahardin-rh
Copy link
Contributor

Looks great!

@ahardin-rh ahardin-rh added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Mar 20, 2020
@jboxman jboxman merged commit 5c5ae48 into openshift:master Mar 21, 2020
@jboxman jboxman deleted the sriov-dpdk-step-sequence branch March 21, 2020 19:00
@jboxman
Copy link
Contributor Author

jboxman commented Mar 21, 2020

/cherry-pick enterprise-4.4

@jboxman
Copy link
Contributor Author

jboxman commented Mar 21, 2020

/cherry-pick enterprise-4.3

@jboxman
Copy link
Contributor Author

jboxman commented Mar 21, 2020

/cherry-pick enterprise-4.2

@openshift-cherrypick-robot

@jboxman: new pull request created: #20628

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.

@openshift-cherrypick-robot

@jboxman: #20617 failed to apply on top of branch "enterprise-4.2":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	modules/nw-sriov-dpdk-example-intel.adoc
A	modules/nw-sriov-dpdk-example-mellanox.adoc
A	modules/nw-sriov-rdma-example-mellanox.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/nw-sriov-rdma-example-mellanox.adoc deleted in HEAD and modified in Ensure procedure steps are sequential. Version Ensure procedure steps are sequential of modules/nw-sriov-rdma-example-mellanox.adoc left in tree.
CONFLICT (modify/delete): modules/nw-sriov-dpdk-example-mellanox.adoc deleted in HEAD and modified in Ensure procedure steps are sequential. Version Ensure procedure steps are sequential of modules/nw-sriov-dpdk-example-mellanox.adoc left in tree.
CONFLICT (modify/delete): modules/nw-sriov-dpdk-example-intel.adoc deleted in HEAD and modified in Ensure procedure steps are sequential. Version Ensure procedure steps are sequential of modules/nw-sriov-dpdk-example-intel.adoc left in tree.
Patch failed at 0001 Ensure procedure steps are sequential

In response to this:

/cherry-pick enterprise-4.2

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

@jboxman: new pull request created: #20629

In response to this:

/cherry-pick enterprise-4.3

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.3 branch/enterprise-4.4 peer-review-done Signifies that the peer review team has reviewed this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants