Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Track account writable deescalation (bp #14626) #14787

Merged
merged 2 commits into from
Jan 23, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 22, 2021

This is an automatic backport of pull request #14626 done by Mergify.

Cherry-pick of 77572a7 has failed:

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

You are currently cherry-picking commit 77572a7c5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   program-test/src/lib.rs
	modified:   programs/bpf/c/src/invoke/invoke.c
	modified:   programs/bpf/c/src/invoked/instruction.h
	modified:   programs/bpf/c/src/invoked/invoked.c
	modified:   programs/bpf/rust/invoke/src/lib.rs
	modified:   programs/bpf/rust/invoked/src/instruction.rs
	modified:   programs/bpf/rust/invoked/src/processor.rs
	modified:   programs/bpf/tests/programs.rs
	modified:   programs/bpf_loader/src/syscalls.rs
	modified:   runtime/benches/message_processor.rs
	modified:   runtime/src/message_processor.rs
	modified:   scripts/build-downstream-projects.sh
	modified:   sdk/src/process_instruction.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/src/feature_set.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 config editor.

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

(cherry picked from commit 77572a7)

# Conflicts:
#	sdk/src/feature_set.rs
@mergify mergify bot added the conflicts label Jan 22, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 22, 2021
@codecov
Copy link

codecov bot commented Jan 23, 2021

Codecov Report

Merging #14787 (55d25ea) into v1.5 (e127631) will decrease coverage by 0.0%.
The diff coverage is 69.8%.

@@            Coverage Diff            @@
##             v1.5   #14787     +/-   ##
=========================================
- Coverage    80.3%    80.2%   -0.1%     
=========================================
  Files         403      403             
  Lines      102030   102077     +47     
=========================================
+ Hits        81933    81966     +33     
- Misses      20097    20111     +14     

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 23, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jan 23, 2021

automerge label removed due to a CI failure

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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