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: missing transformation for field 'new_chain' in ccv consumer genesis (backport #1509) #1511

Merged
merged 3 commits into from
Dec 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 14, 2023

This is an automatic backport of pull request #1509 done by Mergify.
Cherry-pick of f86c61f has failed:

On branch mergify/bp/release/v3.3.x/pr-1509
Your branch is up to date with 'origin/release/v3.3.x'.

You are currently cherry-picking commit f86c61f.
  (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:   app/consumer/genesis.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/consumer/genesis_test.go

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

…esis (#1509)

Fix missing transformation for field 'new_chain' + testing

(cherry picked from commit f86c61f)

# Conflicts:
#	app/consumer/genesis_test.go
@mergify mergify bot requested a review from a team as a code owner December 14, 2023 16:30
@mergify mergify bot added the conflicts label Dec 14, 2023
@bermuell bermuell added C:Testing Assigned automatically by the PR labeler and removed conflicts labels Dec 14, 2023
@bermuell bermuell merged commit 44e9fc7 into release/v3.3.x Dec 14, 2023
10 of 12 checks passed
@bermuell bermuell deleted the mergify/bp/release/v3.3.x/pr-1509 branch December 14, 2023 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:Testing Assigned automatically by the PR labeler
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant