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(codec): add collections value codec for protov2 APIs. (backport #17042) #17069

Merged
merged 2 commits into from
Jul 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 19, 2023

This is an automatic backport of pull request #17042 done by Mergify.
Cherry-pick of 3d15233 has failed:

On branch mergify/bp/release/v0.50.x/pr-17042
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 3d1523357.
  (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:   codec/collections.go
	modified:   codec/collections_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: unknown unknown <unknown@unknown>
(cherry picked from commit 3d15233)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner July 19, 2023 11:55
@mergify mergify bot added the conflicts label Jul 19, 2023
@julienrbrt
Copy link
Member

After this and #17066, I'll tag v0.50 beta.

@julienrbrt julienrbrt enabled auto-merge (squash) July 19, 2023 12:13
@julienrbrt julienrbrt disabled auto-merge July 19, 2023 12:38
@julienrbrt julienrbrt merged commit 609a4e8 into release/v0.50.x Jul 19, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17042 branch July 19, 2023 13:19
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants