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

Make token factory handle empty genesis configurations better (backport #1551) #1553

Merged
merged 2 commits into from
May 20, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 20, 2022

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

On branch mergify/bp/v9.x/pr-1551
Your branch is up to date with 'origin/v9.x'.

You are currently cherry-picking commit d610ff3.
  (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:   x/tokenfactory/genesis.go
	modified:   x/tokenfactory/keeper/createdenom.go

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

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

* Make token factory handle empty genesis configurations better

* add start back to dockerfile

Co-authored-by: Adam Tucker <adamleetucker@outlook.com>
(cherry picked from commit d610ff3)

# Conflicts:
#	Dockerfile
@mergify mergify bot requested a review from a team May 20, 2022 19:11
@mergify mergify bot added the conflicts label May 20, 2022
@czarcas7ic czarcas7ic merged commit 46cc167 into v9.x May 20, 2022
@czarcas7ic czarcas7ic deleted the mergify/bp/v9.x/pr-1551 branch May 20, 2022 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants