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

Update to token pack/unpack changes (bp #11900)#11903

Merged
mergify[bot] merged 2 commits intov1.3from
mergify/bp/v1.3/pr-11900
Aug 29, 2020
Merged

Update to token pack/unpack changes (bp #11900)#11903
mergify[bot] merged 2 commits intov1.3from
mergify/bp/v1.3/pr-11900

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Aug 29, 2020

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

Cherry-pick of 2eff9a1 has failed:

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

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

Changes to be committed:

	modified:   Cargo.lock
	modified:   account-decoder/src/parse_token.rs
	modified:   core/src/rpc.rs
	modified:   transaction-status/Cargo.toml

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

	both modified:   account-decoder/Cargo.toml
	both modified:   core/Cargo.toml

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/

(cherry picked from commit 2eff9a1)

# Conflicts:
#	account-decoder/Cargo.toml
#	core/Cargo.toml
@mergify mergify Bot added the conflicts label Aug 29, 2020
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Aug 29, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 29, 2020

Codecov Report

Merging #11903 into v1.3 will decrease coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff            @@
##            v1.3   #11903     +/-   ##
========================================
- Coverage   82.3%    82.3%   -0.1%     
========================================
  Files        332      332             
  Lines      78177    78179      +2     
========================================
- Hits       64378    64352     -26     
- Misses     13799    13827     +28     

@mergify mergify Bot merged commit bad0709 into v1.3 Aug 29, 2020
@mergify mergify Bot deleted the mergify/bp/v1.3/pr-11900 branch August 29, 2020 05:46
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