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.

Sign up for GitHub

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

Jump to bottom

add spawner for hardware (backport #941) #1216

Merged
merged 5 commits into from
Jan 12, 2024
Merged

add spawner for hardware (backport #941) #1216

merged 5 commits into from
Jan 12, 2024

Commits on Jan 12, 2024

  1. add spawner for hardware (#941) 

    * add spwaner for hardware

* aplly suggestions from code review

* move comment

(cherry picked from commit 937817c)

# Conflicts:
#	controller_manager/controller_manager/__init__.py
#	controller_manager/controller_manager/controller_manager_services.py
    @mamueluth @christophfroehlich
    mamueluth authored and christophfroehlich committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    cecaeba View commit details
    Browse the repository at this point in the history

  2. Resolve conflicts.

    @destogl @christophfroehlich
    destogl authored and christophfroehlich committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    ffd5de5 View commit details
    Browse the repository at this point in the history

  3. Revert changes on controller manager to humble.

    @destogl @christophfroehlich
    destogl authored and christophfroehlich committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    3d4004f View commit details
    Browse the repository at this point in the history

  4. Revert "Revert changes on controller manager to humble." 

    This reverts commit fca604d.
    @christophfroehlich
    christophfroehlich committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    dbc8d3b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'humble' into mergify/bp/humble/pr-941

    @destogl
    destogl authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    709addf View commit details
    Browse the repository at this point in the history