Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Add --warp-epoch and --enable-inflation to ledger-tool cap. (bp #11107)#11132

Merged
mergify[bot] merged 2 commits intov1.2from
mergify/bp/v1.2/pr-11107
Jul 20, 2020
Merged

Add --warp-epoch and --enable-inflation to ledger-tool cap. (bp #11107)#11132
mergify[bot] merged 2 commits intov1.2from
mergify/bp/v1.2/pr-11107

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jul 20, 2020

This is an automated backport of pull request #11107 done by Mergify

Cherry-pick of 3db246f has failed:

On branch mergify/bp/v1.2/pr-11107
Your branch is up to date with 'origin/v1.2'.

You are currently cherry-picking commit 3db246f59.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   runtime/src/accounts.rs
	modified:   runtime/src/bank.rs
	modified:   sdk/src/native_token.rs

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

	both modified:   ledger-tool/src/main.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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 simulator.

Finally, you can contact us on https://mergify.io/

* Add --warp-epoch and --force-inflation to ledger-tool cap.

* Add more arguments

* Address review comments

* Fix message

* Fix various typos...

(cherry picked from commit 3db246f)

# Conflicts:
#	ledger-tool/src/main.rs
@mergify mergify Bot added the conflicts label Jul 20, 2020
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jul 20, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 20, 2020

Codecov Report

Merging #11132 into v1.2 will decrease coverage by 0.0%.
The diff coverage is 25.6%.

@@           Coverage Diff            @@
##            v1.2   #11132     +/-   ##
========================================
- Coverage   82.1%    82.1%   -0.1%     
========================================
  Files        309      309             
  Lines      72861    72894     +33     
========================================
+ Hits       59890    59897      +7     
- Misses     12971    12997     +26     

@mergify mergify Bot merged commit 14baa51 into v1.2 Jul 20, 2020
@mergify mergify Bot deleted the mergify/bp/v1.2/pr-11107 branch July 20, 2020 12:01
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant