You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On branch mergify/bp/v1.6/pr-16422
Your branch is up to date with 'origin/v1.6'.
You are currently cherry-picking commit fa83f3bd7.
(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: Cargo.lock
modified: program-test/src/lib.rs
new file: program-test/tests/sysvar.rs
modified: programs/bpf_loader/src/syscalls.rs
modified: runtime/src/bank.rs
modified: runtime/src/message_processor.rs
modified: sdk/program/src/clock.rs
modified: sdk/program/src/program_stubs.rs
modified: sdk/program/src/sysvar/clock.rs
modified: sdk/program/src/sysvar/epoch_schedule.rs
modified: sdk/program/src/sysvar/fees.rs
modified: sdk/program/src/sysvar/mod.rs
modified: sdk/program/src/sysvar/rent.rs
modified: sdk/src/feature_set.rs
modified: sdk/src/process_instruction.rs
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: program-test/Cargo.toml
both modified: programs/bpf/Cargo.lock
both modified: programs/bpf/rust/sysvar/src/lib.rs
error[E0433]: failed to resolve: use of undeclared crate or module `rent`
--
| --> rust/sysvar/src/lib.rs:92:9
| \|
| 92 \| rent::DEFAULT_LAMPORTS_PER_BYTE_YEAR * rent::DEFAULT_EXEMPTION_THRESHOLD as u64,
| \| ^^^^ use of undeclared crate or module `rent`
mergifybot
added
automerge
Merge this Pull Request automatically once CI passes
and removed
automerge
Merge this Pull Request automatically once CI passes
labels
Apr 14, 2021
mergifybot
added
automerge
Merge this Pull Request automatically once CI passes
and removed
automerge
Merge this Pull Request automatically once CI passes
labels
Apr 14, 2021
mergifybot
added
automerge
Merge this Pull Request automatically once CI passes
and removed
automerge
Merge this Pull Request automatically once CI passes
labels
Apr 14, 2021
mergifybot
added
automerge
Merge this Pull Request automatically once CI passes
and removed
automerge
Merge this Pull Request automatically once CI passes
labels
Apr 14, 2021
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #16422 done by Mergify.
Cherry-pick of fa83f3b has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/