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

[master] fix(helm): mapping of user.anonymize-on-delete.enabled #10668

Merged
merged 1 commit into from
Feb 14, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2025

This is an automatic copy of pull request #10652 done by Mergify.


Issue

https://gravitee.atlassian.net/browse/APIM-8628

Description

  • fix typo
  • fix indentation in gravitee.yml file in helm configmap

Cherry-pick of 00ff9f7 has failed:

On branch mergify/bp/master/pr-10652
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 00ff9f75ac.
  (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:   helm/values.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   helm/CHANGELOG.md
	both modified:   helm/Chart.yaml
	both modified:   helm/templates/api/api-configmap.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


📚  View the storybook of this branch here

@mergify mergify bot requested review from a team as code owners February 14, 2025 13:44
@mergify mergify bot added the conflicts label Feb 14, 2025
Copy link
Contributor Author

mergify bot commented Feb 14, 2025

Cherry-pick of 00ff9f7 has failed:

On branch mergify/bp/master/pr-10652
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 00ff9f75ac.
  (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:   helm/values.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   helm/CHANGELOG.md
	both modified:   helm/Chart.yaml
	both modified:   helm/templates/api/api-configmap.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

@passionne passionne force-pushed the mergify/bp/master/pr-10652 branch from c70282a to 86aa08c Compare February 14, 2025 15:23
@passionne passionne enabled auto-merge (rebase) February 14, 2025 15:26
* fix typo
* fix indentation in gravitee.yml file in helm configmap

APIM-8628

(cherry picked from commit 00ff9f7)

# Conflicts:
#	helm/CHANGELOG.md
#	helm/Chart.yaml
#	helm/templates/api/api-configmap.yaml
@passionne passionne force-pushed the mergify/bp/master/pr-10652 branch from 86aa08c to 025064e Compare February 14, 2025 15:41
@passionne passionne merged commit 5596711 into master Feb 14, 2025
5 checks passed
@passionne passionne deleted the mergify/bp/master/pr-10652 branch February 14, 2025 15:43
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