Skip to content

Conversation

@vikram-redhat
Copy link
Contributor

No description provided.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 18, 2021
@netlify
Copy link

netlify bot commented Mar 18, 2021

Deploy preview for osdocs ready!

Built with commit 0799188

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

@vikram-redhat vikram-redhat merged commit 4e7b4fb into openshift:master Mar 18, 2021
@vikram-redhat
Copy link
Contributor Author

/cherrypick enterprise-4.5

@vikram-redhat
Copy link
Contributor Author

/cherrypick enterprise-4.6

@vikram-redhat
Copy link
Contributor Author

/cherrypick enterprise-4.7

@vikram-redhat
Copy link
Contributor Author

/cherrypick enterprise-4.8

@openshift-cherrypick-robot

@vikram-redhat: #30635 failed to apply on top of branch "enterprise-4.5":

Applying: removed direct links
Using index info to reconstruct a base tree...
A	modules/cnf-provisioning-real-time-and-low-latency-workloads.adoc
A	modules/machine-config-overview.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/machine-config-overview.adoc deleted in HEAD and modified in removed direct links. Version removed direct links of modules/machine-config-overview.adoc left in tree.
CONFLICT (modify/delete): modules/cnf-provisioning-real-time-and-low-latency-workloads.adoc deleted in HEAD and modified in removed direct links. Version removed direct links of modules/cnf-provisioning-real-time-and-low-latency-workloads.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 removed direct links
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:

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

@vikram-redhat: new pull request created: #30636

Details

In response to this:

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

@vikram-redhat: new pull request created: #30637

Details

In response to this:

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

@openshift-cherrypick-robot

@vikram-redhat: new pull request created: #30638

Details

In response to this:

/cherrypick enterprise-4.8

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants