Skip to content

cpu monitor test fix (backport #618 to ros2-humble)#619

Merged
ct2034 merged 2 commits into
ros2-humblefrom
mergify/bp/ros2-humble/pr-618
May 22, 2026
Merged

cpu monitor test fix (backport #618 to ros2-humble)#619
ct2034 merged 2 commits into
ros2-humblefrom
mergify/bp/ros2-humble/pr-618

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 22, 2026

Signed-off-by: Christian Henkel christian.henkel2@de.bosch.com


This is an automatic backport of pull request #618 done by Mergify.

Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com>
(cherry picked from commit fa062d0)

# Conflicts:
#	diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py
@mergify mergify Bot added automerge PRs with this label will be merged if all checks are green conflicts labels May 22, 2026
@mergify mergify Bot assigned ct2034 May 22, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 22, 2026

Cherry-pick of fa062d0 has failed:

On branch mergify/bp/ros2-humble/pr-618
Your branch is up to date with 'origin/ros2-humble'.

You are currently cherry-picking commit fa062d0.
  (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:   diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com>
@ct2034 ct2034 removed the conflicts label May 22, 2026
@ct2034 ct2034 merged commit 1d44af4 into ros2-humble May 22, 2026
6 of 7 checks passed
@ct2034 ct2034 deleted the mergify/bp/ros2-humble/pr-618 branch May 22, 2026 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge PRs with this label will be merged if all checks are green

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant