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

genesis-programs: Simplify get_programs(), specify a real Preview activation epoch for new BPFLoader (bp #11916)#11930

Merged
mergify[bot] merged 1 commit intov1.3from
mergify/bp/v1.3/pr-11916
Aug 31, 2020
Merged

genesis-programs: Simplify get_programs(), specify a real Preview activation epoch for new BPFLoader (bp #11916)#11930
mergify[bot] merged 1 commit intov1.3from
mergify/bp/v1.3/pr-11916

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Aug 31, 2020

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

Cherry-pick of f385af2 has failed:

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

You are currently cherry-picking commit f385af25e.
  (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/bank.rs

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

	both modified:   genesis-programs/src/lib.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 conflicts automerge Merge this Pull Request automatically once CI passes labels Aug 31, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 31, 2020

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 31, 2020
@mvines mvines force-pushed the mergify/bp/v1.3/pr-11916 branch from d097d61 to ca49bc4 Compare August 31, 2020 16:15
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Aug 31, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 31, 2020

Codecov Report

Merging #11930 into v1.3 will decrease coverage by 0.0%.
The diff coverage is 73.3%.

@@           Coverage Diff            @@
##            v1.3   #11930     +/-   ##
========================================
- Coverage   82.3%    82.3%   -0.1%     
========================================
  Files        332      332             
  Lines      78184    78179      -5     
========================================
- Hits       64377    64364     -13     
- Misses     13807    13815      +8     

@mergify mergify Bot merged commit eb65ff7 into v1.3 Aug 31, 2020
@mergify mergify Bot deleted the mergify/bp/v1.3/pr-11916 branch August 31, 2020 17:21
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