Skip to content

Conversation

@bmcelvee
Copy link
Contributor

@bmcelvee bmcelvee commented Mar 16, 2022

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 16, 2022
@bmcelvee bmcelvee added this to the Next Release milestone Mar 16, 2022
@netlify
Copy link

netlify bot commented Mar 16, 2022

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 4a30282

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/62324457c0025f00082734d5

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

@bmcelvee bmcelvee added the peer-review-needed Signifies that the peer review team needs to review this PR label Mar 16, 2022
@bmcelvee
Copy link
Contributor Author

Peer review and manager acks on Slack. Thank you, @EricPonvelle and @AndrewJones-RH!

@bmcelvee
Copy link
Contributor Author

No QE review needed.

@bmcelvee bmcelvee merged commit 562d7aa into openshift:main Mar 16, 2022
@bmcelvee
Copy link
Contributor Author

/cherrypick enterprise-4.10

@bmcelvee
Copy link
Contributor Author

/cherrypick enterprise-4.11

@bmcelvee bmcelvee 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 16, 2022
@openshift-cherrypick-robot

@bmcelvee: #43367 failed to apply on top of branch "enterprise-4.10":

Applying: PR-41923: clean up files and build getting started assemblies
Using index info to reconstruct a base tree...
M	rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
Falling back to patching base and 3-way merge...
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/snippets
Removing rosa_getting_started/rosa_getting_started_sts/rosa-sts-setting-up-environment.adoc
CONFLICT (modify/delete): rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc deleted in PR-41923: clean up files and build getting started assemblies and modified in HEAD. Version HEAD of rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc left in tree.
Removing rosa_getting_started/rosa_getting_started_sts/rosa-sts-getting-started-workflow.adoc
Removing rosa_getting_started/rosa_getting_started_sts/rosa-sts-aws-prereqs.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 PR-41923: clean up files and build getting started assemblies
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:

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

@openshift-cherrypick-robot

@bmcelvee: #43367 failed to apply on top of branch "enterprise-4.11":

Applying: PR-41923: clean up files and build getting started assemblies
Using index info to reconstruct a base tree...
M	rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
Falling back to patching base and 3-way merge...
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/snippets
Removing rosa_getting_started/rosa_getting_started_sts/rosa-sts-setting-up-environment.adoc
CONFLICT (modify/delete): rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc deleted in PR-41923: clean up files and build getting started assemblies and modified in HEAD. Version HEAD of rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc left in tree.
Removing rosa_getting_started/rosa_getting_started_sts/rosa-sts-getting-started-workflow.adoc
Removing rosa_getting_started/rosa_getting_started_sts/rosa-sts-aws-prereqs.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 PR-41923: clean up files and build getting started assemblies
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:

/cherrypick enterprise-4.11

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 branch/enterprise-4.11 peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants