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

Fix WaitSet issue in tests (backport #1206) #1211

Merged
merged 3 commits into from
Jul 17, 2024
Merged

Fix WaitSet issue in tests (backport #1206) #1211

merged 3 commits into from
Jul 17, 2024

Commits on Jul 16, 2024

  1. Fix WaitSet issue in tests (#1206) 

    (cherry picked from commit 2674f6d)

# Conflicts:
#	joint_trajectory_controller/test/test_trajectory_controller.cpp
#	joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
    @saikishor @mergify
    saikishor authored and mergify[bot] committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    2be0010 View commit details
    Browse the repository at this point in the history

  2. conflict fixup

    @bmagyar
    bmagyar authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    e6e6ac1 View commit details
    Browse the repository at this point in the history

  3. remove last conflict

    @bmagyar
    bmagyar authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    c84286c View commit details
    Browse the repository at this point in the history