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

disable http2 follow up #933

Merged
merged 1 commit into from
Oct 25, 2023

Conversation

stuggi
Copy link
Contributor

@stuggi stuggi commented Oct 25, 2023

No description provided.

@openshift-ci openshift-ci bot requested review from dprince and olliewalsh October 25, 2023 09:30
@stuggi stuggi requested a review from abays October 25, 2023 09:30
Copy link
Contributor

@abays abays left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 25, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, stuggi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot merged commit e0ce834 into openstack-k8s-operators:master Oct 25, 2023
@stuggi
Copy link
Contributor Author

stuggi commented Oct 26, 2023

/cherry-pick v1.3.x

@openshift-cherrypick-robot

@stuggi: #933 failed to apply on top of branch "v1.3.x":

Applying: disable http2 follow up
Using index info to reconstruct a base tree...
M	main.go
Falling back to patching base and 3-way merge...
Auto-merging main.go
CONFLICT (content): Merge conflict in main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 disable http2 follow up
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 v1.3.x

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