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

chore(docs): update doc/config.md to reflect 3.0 changes (backport #922) #929

Merged
merged 2 commits into from
Sep 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 9, 2024

Welcome to Cryostat! 👋

Before contributing, make sure you have:

  • Read the contributing guidelines
  • Linked a relevant issue which this PR resolves
  • Linked any other relevant issues, PR's, or documentation, if any
  • Resolved all conflicts, if any
  • Rebased your branch PR on top of the latest upstream main branch
  • Attached at least one of the following labels to the PR: [chore, ci, docs, feat, fix, test]
  • Signed all commits: git commit -S -m "YOUR_COMMIT_MESSAGE"

Fixes: #899


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

* update examples in config to v1beta2

* fix outdated links and info

* update info

* fix storage/database typo

* reviews

* make bundle update

(cherry picked from commit 56bfead)

# Conflicts:
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@mergify mergify bot added the conflicts label Aug 9, 2024
Copy link
Contributor Author

mergify bot commented Aug 9, 2024

Cherry-pick of 56bfead has failed:

On branch mergify/bp/cryostat-v3.0/pr-922
Your branch is up to date with 'origin/cryostat-v3.0'.

You are currently cherry-picking commit 56bfead.
  (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)

Changes to be committed:
	modified:   Makefile
	modified:   docs/config.md
	modified:   internal/controllers/suite_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bundle/manifests/cryostat-operator.clusterserviceversion.yaml

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

@ebaron ebaron added chore Refactor, rename, cleanup, etc. and removed conflicts labels Sep 9, 2024
@ebaron ebaron merged commit 67fade1 into cryostat-v3.0 Sep 9, 2024
5 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat-v3.0/pr-922 branch September 9, 2024 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Refactor, rename, cleanup, etc.
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants