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

More serde snapshot cleanup (backport #22449)#22872

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

More serde snapshot cleanup (backport #22449)#22872
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-22449

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Feb 1, 2022

This is an automatic backport of pull request #22449 done by Mergify.
Cherry-pick of 2756abc has failed:

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

You are currently cherry-picking commit 2756abce3.
  (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:
	new file:   runtime/src/serde_snapshot/storage.rs
	modified:   runtime/src/serde_snapshot/tests.rs
	modified:   runtime/src/snapshot_utils.rs

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

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

mergify Bot commented Feb 1, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Feb 1, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 1, 2022

Codecov Report

Merging #22872 (bbc1794) into v1.9 (3aa3cd8) will decrease coverage by 0.0%.
The diff coverage is 56.9%.

@@            Coverage Diff            @@
##             v1.9   #22872     +/-   ##
=========================================
- Coverage    81.2%    81.1%   -0.1%     
=========================================
  Files         530      531      +1     
  Lines      146864   146866      +2     
=========================================
- Hits       119283   119246     -37     
- Misses      27581    27620     +39     

@mergify mergify Bot merged commit a98ca90 into v1.9 Feb 1, 2022
@brooksprumo brooksprumo deleted the mergify/bp/v1.9/pr-22449 branch February 1, 2022 22:26
@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.

1 participant