Skip to content

cpu monitor test fix#618

Merged
ct2034 merged 1 commit into
ros2from
fix/cpu_mon_test
May 22, 2026
Merged

cpu monitor test fix#618
ct2034 merged 1 commit into
ros2from
fix/cpu_mon_test

Conversation

@ct2034
Copy link
Copy Markdown
Collaborator

@ct2034 ct2034 commented May 22, 2026

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

Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com>
@mergify mergify Bot added the ros2 PR tackling a ROS2 branch label May 22, 2026
@ct2034 ct2034 changed the title cpu monitor fix cpu monitor test fix May 22, 2026
@ct2034 ct2034 added automerge PRs with this label will be merged if all checks are green backport Mergify will try to backport this. (WIP / Testing the functionality) labels May 22, 2026
@ct2034 ct2034 merged commit fa062d0 into ros2 May 22, 2026
6 of 7 checks passed
@ct2034 ct2034 deleted the fix/cpu_mon_test branch May 22, 2026 08:32
ct2034 added a commit that referenced this pull request May 22, 2026
* cpu monitor fix (#618)

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

* fix conflict

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

---------

Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com>
Co-authored-by: Christian Henkel <6976069+ct2034@users.noreply.github.com>
Co-authored-by: Christian Henkel <christian.henkel2@de.bosch.com>
ct2034 added a commit that referenced this pull request May 22, 2026
* cpu monitor fix (#618)

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

* fix conflict

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

---------

Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com>
Co-authored-by: Christian Henkel <6976069+ct2034@users.noreply.github.com>
Co-authored-by: Christian Henkel <christian.henkel2@de.bosch.com>
ct2034 added a commit that referenced this pull request May 22, 2026
* cpu monitor fix (#618)

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

* fix conflict

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

---------

Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com>
Co-authored-by: Christian Henkel <6976069+ct2034@users.noreply.github.com>
Co-authored-by: Christian Henkel <christian.henkel2@de.bosch.com>
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 backport Mergify will try to backport this. (WIP / Testing the functionality) ros2 PR tackling a ROS2 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant