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

Add OpenShift 4.10 APIs #42177

Merged
merged 1 commit into from
Feb 22, 2022
Merged

Add OpenShift 4.10 APIs #42177

merged 1 commit into from
Feb 22, 2022

Conversation

jboxman-rh
Copy link

This adds the OpenShift APIs.

@jboxman-rh jboxman-rh added this to the Future Release milestone Feb 22, 2022
@jboxman-rh jboxman-rh self-assigned this Feb 22, 2022
@openshift-ci openshift-ci bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 22, 2022
@netlify
Copy link

netlify bot commented Feb 22, 2022

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 4edee33

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/621502f447e1cc00082168f4

😎 Browse the preview: https://deploy-preview-42177--osdocs.netlify.app

@jboxman-rh jboxman-rh merged commit ae7c8c1 into openshift:main Feb 22, 2022
@jboxman-rh
Copy link
Author

/cherry-pick enterprise-4.10

@jboxman-rh jboxman-rh deleted the apis-410 branch February 22, 2022 16:12
@openshift-cherrypick-robot

@jboxman-rh: #42177 failed to apply on top of branch "enterprise-4.10":

Applying: Add OpenShift 4.10 APIs
.git/rebase-apply/patch:2616: trailing whitespace.
| 
.git/rebase-apply/patch:2651: trailing whitespace.
| 
.git/rebase-apply/patch:2733: trailing whitespace.
| 
.git/rebase-apply/patch:3993: trailing whitespace.
| 
.git/rebase-apply/patch:4033: trailing whitespace.
| 
warning: squelched 320 whitespace errors
warning: 325 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	rest_api/config_apis/network-config-openshift-io-v1.adoc
M	rest_api/operator_apis/dns-operator-openshift-io-v1.adoc
M	rest_api/workloads_apis/deploymentconfig-apps-openshift-io-v1.adoc
Falling back to patching base and 3-way merge...
Auto-merging rest_api/workloads_apis/deploymentconfig-apps-openshift-io-v1.adoc
CONFLICT (content): Merge conflict in rest_api/workloads_apis/deploymentconfig-apps-openshift-io-v1.adoc
Auto-merging rest_api/operator_apis/dns-operator-openshift-io-v1.adoc
CONFLICT (content): Merge conflict in rest_api/operator_apis/dns-operator-openshift-io-v1.adoc
Auto-merging rest_api/config_apis/network-config-openshift-io-v1.adoc
CONFLICT (content): Merge conflict in rest_api/config_apis/network-config-openshift-io-v1.adoc
Auto-merging _topic_maps/_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 Add OpenShift 4.10 APIs
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:

/cherry-pick enterprise-4.10

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.10 size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants