Skip to content

Conversation

@bergerhoffer
Copy link
Contributor

No description provided.

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 24, 2021
@bergerhoffer bergerhoffer added branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-needed Signifies that the peer review team needs to review this PR and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 24, 2021
@bergerhoffer bergerhoffer added this to the Next Release milestone Feb 24, 2021
@bergerhoffer bergerhoffer added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 24, 2021
@netlify
Copy link

netlify bot commented Feb 24, 2021

Deploy preview for osdocs ready!

Built with commit 353adcf

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

@ahardin-rh
Copy link
Contributor

LGTM!

@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 Feb 24, 2021
@bergerhoffer bergerhoffer merged commit 803a964 into openshift:master Feb 25, 2021
@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.8

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.7

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.6

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.5

@openshift-cherrypick-robot

@bergerhoffer: new pull request created: #29841

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.

@openshift-cherrypick-robot

@bergerhoffer: new pull request created: #29842

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

@bergerhoffer: #29803 failed to apply on top of branch "enterprise-4.6":

Applying: Adding missing prompts
Using index info to reconstruct a base tree...
A	authentication/managing_cloud_provider_credentials/cco-mode-sts.adoc
M	modules/cluster-logging-collector-envvar.adoc
M	modules/cluster-logging-deploy-cli.adoc
A	modules/machineset-osp-adding-bare-metal.adoc
M	modules/op-release-notes-1-2.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/op-release-notes-1-2.adoc
CONFLICT (modify/delete): modules/machineset-osp-adding-bare-metal.adoc deleted in HEAD and modified in Adding missing prompts. Version Adding missing prompts of modules/machineset-osp-adding-bare-metal.adoc left in tree.
Auto-merging modules/cluster-logging-deploy-cli.adoc
Auto-merging modules/cluster-logging-collector-envvar.adoc
CONFLICT (modify/delete): authentication/managing_cloud_provider_credentials/cco-mode-sts.adoc deleted in HEAD and modified in Adding missing prompts. Version Adding missing prompts of authentication/managing_cloud_provider_credentials/cco-mode-sts.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 Adding missing prompts
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.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

@bergerhoffer: #29803 failed to apply on top of branch "enterprise-4.5":

Applying: Adding missing prompts
Using index info to reconstruct a base tree...
A	authentication/managing_cloud_provider_credentials/cco-mode-sts.adoc
M	modules/cluster-logging-collector-envvar.adoc
M	modules/cluster-logging-deploy-cli.adoc
A	modules/machineset-osp-adding-bare-metal.adoc
A	modules/op-release-notes-1-2.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/op-release-notes-1-2.adoc deleted in HEAD and modified in Adding missing prompts. Version Adding missing prompts of modules/op-release-notes-1-2.adoc left in tree.
CONFLICT (modify/delete): modules/machineset-osp-adding-bare-metal.adoc deleted in HEAD and modified in Adding missing prompts. Version Adding missing prompts of modules/machineset-osp-adding-bare-metal.adoc left in tree.
Auto-merging modules/cluster-logging-deploy-cli.adoc
Auto-merging modules/cluster-logging-collector-envvar.adoc
CONFLICT (modify/delete): authentication/managing_cloud_provider_credentials/cco-mode-sts.adoc deleted in HEAD and modified in Adding missing prompts. Version Adding missing prompts of authentication/managing_cloud_provider_credentials/cco-mode-sts.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 Adding missing prompts
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.

This was referenced Feb 25, 2021
@bergerhoffer bergerhoffer deleted the fixing-missing-prompts branch August 2, 2022 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants