Skip to content

Conversation

@jboxman
Copy link
Contributor

@jboxman jboxman commented Mar 3, 2021

Duplicate bullet.

Must confirm how many versions this applies to.

@jboxman jboxman added peer-review-needed Signifies that the peer review team needs to review this PR branch/enterprise-4.7 branch/enterprise-4.8 labels Mar 3, 2021
@jboxman jboxman added this to the Next Release milestone Mar 3, 2021
@jboxman jboxman self-assigned this Mar 3, 2021
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 3, 2021
@netlify
Copy link

netlify bot commented Mar 3, 2021

Deploy preview for osdocs ready!

Built with commit a3c9b91

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

@jboxman jboxman merged commit 475afa6 into openshift:master Mar 3, 2021
@jboxman jboxman deleted the fix-cluster-logging-deploy-console-warn branch March 3, 2021 18:24
@jboxman
Copy link
Contributor Author

jboxman commented Mar 3, 2021

/cherry-pick enterprise-4.8

@openshift-cherrypick-robot

@jboxman: new pull request created: #30070

Details

In response to this:

/cherry-pick 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.

@jboxman
Copy link
Contributor Author

jboxman commented Mar 3, 2021

/cherry-pick enterprise-4.7

@openshift-cherrypick-robot

@jboxman: new pull request created: #30071

Details

In response to this:

/cherry-pick 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.

@jboxman
Copy link
Contributor Author

jboxman commented Mar 3, 2021

/cherry-pick enterprise-4.6

@openshift-cherrypick-robot

@jboxman: #30048 failed to apply on top of branch "enterprise-4.6":

Applying: Silence warning about duplicate callout
Using index info to reconstruct a base tree...
M	modules/cluster-logging-deploy-console.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-deploy-console.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-console.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 Silence warning about duplicate callout
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:

/cherry-pick 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.

@jboxman
Copy link
Contributor Author

jboxman commented Mar 3, 2021

/cherry-pick enterprise-4.5

@openshift-cherrypick-robot

@jboxman: #30048 failed to apply on top of branch "enterprise-4.5":

Applying: Silence warning about duplicate callout
Using index info to reconstruct a base tree...
M	modules/cluster-logging-deploy-console.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-deploy-console.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-console.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 Silence warning about duplicate callout
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:

/cherry-pick 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.

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-needed Signifies that the peer review team needs to review this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants