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

fix(authproxy): deploy openshift-oauth-proxy fork (backport #146) #148

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 7, 2024

See cryostatio/cryostat-operator#853


This is an automatic backport of pull request #146 done by [Mergify](https://mergify.com).

(cherry picked from commit 28b8673)

# Conflicts:
#	charts/cryostat/README.md
#	charts/cryostat/values.schema.json
#	charts/cryostat/values.yaml
Copy link
Contributor Author

mergify bot commented Jun 7, 2024

Cherry-pick of 28b8673 has failed:

On branch mergify/bp/cryostat-v2.4/pr-146
Your branch is up to date with 'origin/cryostat-v2.4'.

You are currently cherry-picking commit 28b8673.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   charts/cryostat/README.md
	both modified:   charts/cryostat/values.schema.json
	both modified:   charts/cryostat/values.yaml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot deleted the mergify/bp/cryostat-v2.4/pr-146 branch June 7, 2024 20:52
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.

1 participant