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

Split staker infos (bp #8682) #8683

Merged
merged 1 commit into from
Mar 7, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 6, 2020

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

Cherry-pick of 0919b13 has failed:

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

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

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

	both modified:   genesis/src/genesis_accounts.rs

no changes added to commit (use "git add" and/or "git commit -a")

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
  • @Mergifyio backports <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 automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 6, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@garious
Copy link
Contributor

garious commented Mar 7, 2020

Need to rebase on #8707

@garious garious force-pushed the mergify/bp/v1.0/pr-8682 branch from 96ccbf6 to 05c7e1e Compare March 7, 2020 05:26
@codecov
Copy link

codecov bot commented Mar 7, 2020

Codecov Report

Merging #8683 into v1.0 will decrease coverage by <.1%.
The diff coverage is 100%.

@@           Coverage Diff           @@
##            v1.0   #8683     +/-   ##
=======================================
- Coverage     80%     80%   -0.1%     
=======================================
  Files        260     260             
  Lines      56233   56236      +3     
=======================================
+ Hits       45020   45021      +1     
- Misses     11213   11215      +2

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 7, 2020
@solana-grimes solana-grimes merged commit 67216ac into v1.0 Mar 7, 2020
@mergify mergify bot deleted the mergify/bp/v1.0/pr-8682 branch March 7, 2020 07:44
# for free to subscribe to this conversation on GitHub. Already have an account? #.
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