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

feat(store): update does not wipe out labels (backport of #10335) #11952

Closed
wants to merge 1 commit into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Oct 31, 2024

Automatic cherry-pick of #10335 for branch release-2.5

Generated by action

cherry-picked commit b0abc25
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.5
Your branch is up to date with 'origin/release-2.5'.

You are currently cherry-picking commit b0abc25a4.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   pkg/core/resources/apis/meshservice/vip/allocator.go
	both modified:   pkg/core/resources/store/options.go
	both modified:   pkg/plugins/resources/k8s/store.go
	both modified:   pkg/plugins/resources/memory/store.go
	both modified:   pkg/plugins/resources/postgres/pgx_store.go
	both modified:   pkg/test/store/store_test_template.go

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

@kumahq kumahq bot requested a review from a team as a code owner October 31, 2024 08:53
@kumahq kumahq bot requested review from jijiechen and michaelbeaumont and removed request for a team October 31, 2024 08:53
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.

2 participants