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

chore: renaming ica migrations handler pkg version (backport #2355) #2384

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 26, 2022

This is an automatic backport of pull request #2355 done by Mergify.
Cherry-pick of 1dca3b0 has failed:

On branch mergify/bp/release/v6.0.x/pr-2355
Your branch is up to date with 'origin/release/v6.0.x'.

You are currently cherry-picking commit 1dca3b0.
  (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:
	deleted:    modules/apps/27-interchain-accounts/controller/migrations/v5/migrations_test.go
	renamed:    modules/apps/27-interchain-accounts/controller/migrations/v5/migrations.go -> modules/apps/27-interchain-accounts/controller/migrations/v6/migrations.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/27-interchain-accounts/controller/migrations/v6/migrations_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

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 1dca3b0)

# Conflicts:
#	modules/apps/27-interchain-accounts/controller/migrations/v6/migrations_test.go
@damiannolan
Copy link
Member

I think these changes are included in #2364. Either way I think that PR should be merged first and can follow up here after

@mergify mergify bot deleted the mergify/bp/release/v6.0.x/pr-2355 branch September 26, 2022 15:09
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