Skip to content

fix: Add gov proposal migration in v0.3.1 upgrade handler (backport #478)#479

Merged
rbajollari merged 2 commits intorelease/v0.3.xfrom
mergify/bp/release/v0.3.x/pr-478
Jul 18, 2024
Merged

fix: Add gov proposal migration in v0.3.1 upgrade handler (backport #478)#479
rbajollari merged 2 commits intorelease/v0.3.xfrom
mergify/bp/release/v0.3.x/pr-478

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jul 16, 2024

Description

closes: #XXXX

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • added appropriate labels to the PR
  • targeted the correct branch
  • provided a link to the relevant issue or specification
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)
This is an automatic backport of pull request #478 done by [Mergify](https://mergify.com).

@rbajollari @mergify
fix: Add gov proposal migration in v0.3.1 upgrade handler (#478)
7580950 
(cherry picked from commit 2965d45)

# Conflicts:
#	app/upgrades.go
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jul 16, 2024

Cherry-pick of 2965d45 has failed:

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

You are currently cherry-picking commit 2965d45.
  (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 <file>..." to mark resolution)
	both modified:   app/upgrades.go

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

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

@mergify mergify bot requested a review from a team as a code owner July 16, 2024 05:11
@mergify mergify bot added the conflicts label Jul 16, 2024
@rbajollari rbajollari merged commit 787e16e into release/v0.3.x Jul 18, 2024
@rbajollari rbajollari deleted the mergify/bp/release/v0.3.x/pr-478 branch July 18, 2024 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rbajollari rbajollari rbajollari approved these changes

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@rbajollari