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

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 6, 2023

This is an automatic backport of pull request #34319 done by Mergify.
Cherry-pick of f70d548 has failed:

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

You are currently cherry-picking commit f70d5481bc.
  (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:   program-runtime/src/loaded_programs.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

@mergify mergify bot added the conflicts label Dec 6, 2023
@mergify mergify bot assigned Lichtso Dec 6, 2023
…ams` (#34319)

Uses fetch_add() to accumulate usage counters.

(cherry picked from commit f70d548)
@Lichtso Lichtso force-pushed the mergify/bp/v1.17/pr-34319 branch from caf4028 to 49448b0 Compare December 12, 2023 12:35
@Lichtso Lichtso removed the conflicts label Dec 12, 2023
@codecov
Copy link

codecov bot commented Dec 12, 2023

Codecov Report

Merging #34348 (49448b0) into v1.17 (311e986) will decrease coverage by 0.1%.
Report is 11 commits behind head on v1.17.
The diff coverage is 100.0%.

Additional details and impacted files
@@            Coverage Diff            @@
##            v1.17   #34348     +/-   ##
=========================================
- Coverage    81.8%    81.8%   -0.1%     
=========================================
  Files         803      803             
  Lines      218110   218109      -1     
=========================================
- Hits       178570   178545     -25     
- Misses      39540    39564     +24     

@Lichtso Lichtso merged commit 0b6a172 into v1.17 Dec 12, 2023
@Lichtso Lichtso deleted the mergify/bp/v1.17/pr-34319 branch December 12, 2023 21:42
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants