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

Cleanup serde snapshot's "future" to "newer" (backport #22431)#22870

Merged
mergify[bot] merged 3 commits intov1.9from
mergify/bp/v1.9/pr-22431
Feb 1, 2022
Merged

Cleanup serde snapshot's "future" to "newer" (backport #22431)#22870
mergify[bot] merged 3 commits intov1.9from
mergify/bp/v1.9/pr-22431

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Feb 1, 2022

This is an automatic backport of pull request #22431 done by Mergify.
Cherry-pick of 9c3144e has failed:

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

You are currently cherry-picking commit 9c3144e28.
  (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:
	renamed:    runtime/src/serde_snapshot/future.rs -> runtime/src/serde_snapshot/newer.rs
	modified:   runtime/src/serde_snapshot/tests.rs

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

(cherry picked from commit 9c3144e)

# Conflicts:
#	runtime/src/serde_snapshot.rs
@mergify mergify Bot added the conflicts label Feb 1, 2022
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Feb 1, 2022
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 1, 2022
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Feb 1, 2022
@mergify mergify Bot merged commit 12e40a4 into v1.9 Feb 1, 2022
@mergify mergify Bot deleted the mergify/bp/v1.9/pr-22431 branch February 1, 2022 19:03
@brooksprumo brooksprumo self-assigned this Feb 2, 2022
@github-actions
Copy link
Copy Markdown
Contributor

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Mar 30, 2022
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 locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants