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

Serialize lamports per signature in snapshots (backport #25181)#25224

Closed
mergify[bot] wants to merge 1 commit intov1.10from
mergify/bp/v1.10/pr-25181
Closed

Serialize lamports per signature in snapshots (backport #25181)#25224
mergify[bot] wants to merge 1 commit intov1.10from
mergify/bp/v1.10/pr-25181

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 14, 2022

This is an automatic backport of pull request #25181 done by Mergify.
Cherry-pick of 35d2a0f has failed:

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

You are currently cherry-picking commit 35d2a0fd6.
  (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:   sdk/program/src/fee_calculator.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/serde_snapshot/newer.rs
	both modified:   runtime/src/serde_snapshot/tests.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

* Serialize lamports per signature

* pr comments

(cherry picked from commit 35d2a0f)

# Conflicts:
#	runtime/src/serde_snapshot/newer.rs
#	runtime/src/serde_snapshot/tests.rs
@mergify mergify Bot added the conflicts label May 14, 2022
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label May 14, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 14, 2022

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label May 14, 2022
@jstarry jstarry added the no-automerge Prevent the automerge label from being applied label May 15, 2022
@mergify mergify Bot deleted the mergify/bp/v1.10/pr-25181 branch May 18, 2022 01:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

conflicts no-automerge Prevent the automerge label from being applied

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants