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

new net-stats require a new table (backport #21996) #21999

Merged
merged 2 commits into from
Dec 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 18, 2021

This is an automatic backport of pull request #21996 done by Mergify.
Cherry-pick of 3fe942a has failed:

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

You are currently cherry-picking commit 3fe942ab3.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/system_monitor_service.rs

no changes added to commit (use "git add" and/or "git commit -a")

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 3fe942a)

# Conflicts:
#	core/src/system_monitor_service.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Dec 18, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Dec 18, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 18, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 18, 2021
@codecov
Copy link

codecov bot commented Dec 18, 2021

Codecov Report

Merging #21999 (e6f1e7c) into v1.8 (33cd3a1) will increase coverage by 0.0%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v1.8   #21999   +/-   ##
=======================================
  Coverage    81.6%    81.6%           
=======================================
  Files         459      459           
  Lines      130624   130619    -5     
=======================================
+ Hits       106600   106603    +3     
+ Misses      24024    24016    -8     

@mergify mergify bot merged commit ddef156 into v1.8 Dec 18, 2021
@mergify mergify bot deleted the mergify/bp/v1.8/pr-21996 branch December 18, 2021 10:29
@github-actions
Copy link
Contributor

github-actions bot commented Apr 4, 2022

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 Apr 4, 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