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

Fixup deserialize_bs58_transaction (bp #10171) #10177

Merged
merged 1 commit into from
May 22, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 22, 2020

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

Cherry-pick of 12a3b1b has failed:

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

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

Changes to be committed:

	modified:   core/tests/rpc.rs

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

	both modified:   core/src/rpc.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/

@mergify mergify bot added the conflicts label May 22, 2020
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.1/pr-10171 branch from 866ad33 to dc0db92 Compare May 22, 2020 00:45
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 22, 2020
@solana-grimes solana-grimes merged commit ccfe09e into v1.1 May 22, 2020
@codecov
Copy link

codecov bot commented May 22, 2020

Codecov Report

Merging #10177 into v1.1 will increase coverage by 0.0%.
The diff coverage is 86.3%.

@@          Coverage Diff           @@
##            v1.1   #10177   +/-   ##
======================================
  Coverage   80.5%    80.6%           
======================================
  Files        288      288           
  Lines      66080    66085    +5     
======================================
+ Hits       53241    53310   +69     
+ Misses     12839    12775   -64     

@mergify mergify bot deleted the mergify/bp/v1.1/pr-10171 branch May 22, 2020 02:09
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants