Merge branch 'master' into ackermann-odometry-library

StoglRobotics-forks · Apr 5, 2023 · cd7622e · cd7622e
2 parents c609707 + 1508d45
commit cd7622e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/ros2_controllers-not-released.humble.repos b/ros2_controllers-not-released.humble.repos
@@ -4,7 +4,3 @@ repositories:
 #     type: git
 #     url: [email protected]:<some_github_namespace>/<some_ros_package>.git
 #     version: master
-  control_msgs:
-    type: git
-    url: https://github.com/ros-controls/control_msgs.git
-    version: humble
diff --git a/ros2_controllers.humble.repos b/ros2_controllers.humble.repos
@@ -2,7 +2,7 @@ repositories:
   ros2_control:
     type: git
     url: https://github.com/ros-controls/ros2_control.git
-    version: master
+    version: humble
   realtime_tools:
     type: git
     url: https://github.com/ros-controls/realtime_tools.git

diff --git a/ros2_controllers.rolling.repos b/ros2_controllers.rolling.repos
@@ -10,7 +10,7 @@ repositories:
   control_msgs:
     type: git
     url: https://github.com/ros-controls/control_msgs.git
-    version: add-steering-controller-status-msgs
+    version: master
   control_toolbox:
     type: git
     url: https://github.com/ros-controls/control_toolbox.git