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

Add back balances_from_state_export_command (backport #1594) #1595

Merged
merged 4 commits into from
May 31, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 26, 2022

This is an automatic backport of pull request #1594 done by Mergify.
Cherry-pick of 74c9bd5 has failed:

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

You are currently cherry-picking commit 74c9bd5.
  (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:   cmd/osmosisd/cmd/root.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cmd/osmosisd/cmd/balances_from_state_export.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: Aleksandr Bezobchuk <[email protected]>
(cherry picked from commit 74c9bd5)

# Conflicts:
#	cmd/osmosisd/cmd/balances_from_state_export.go
@mergify mergify bot added the conflicts label May 26, 2022
@codecov-commenter
Copy link

codecov-commenter commented May 31, 2022

Codecov Report

Merging #1595 (f40636a) into v8.x (ef21a94) will decrease coverage by 0.00%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             v8.x    #1595      +/-   ##
==========================================
- Coverage   20.66%   20.66%   -0.01%     
==========================================
  Files         204      204              
  Lines       25991    25998       +7     
==========================================
  Hits         5372     5372              
- Misses      19637    19644       +7     
  Partials      982      982              
Impacted Files Coverage Δ
app/upgrades/v8/forks.go 0.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ef21a94...f40636a. Read the comment docs.

@alexanderbez alexanderbez merged commit dbeac2c into v8.x May 31, 2022
@alexanderbez alexanderbez deleted the mergify/bp/v8.x/pr-1594 branch May 31, 2022 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants