From 13cd553ae8a58a5fa974972cbdc18647f5184b67 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 27 Dec 2023 20:51:10 +0000
Subject: [PATCH 1/4] [CI] Increase timeout for controller_managers_srv test
 (backport #1224) (#1225)

---
 controller_manager/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/controller_manager/CMakeLists.txt b/controller_manager/CMakeLists.txt
index a3adf25ff7..29d489ad81 100644
--- a/controller_manager/CMakeLists.txt
+++ b/controller_manager/CMakeLists.txt
@@ -134,6 +134,7 @@ if(BUILD_TESTING)
     controller_manager_msgs
     ros2_control_test_assets
   )
+  set_tests_properties(test_controller_manager_srvs PROPERTIES TIMEOUT 120)
   ament_add_gmock(test_controller_manager_urdf_passing
     test/test_controller_manager_urdf_passing.cpp
   )

From 9fbfd9318d26c6f3d0dc803937ef88d5e46ea67c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 27 Dec 2023 20:52:45 +0000
Subject: [PATCH 2/4] Do not run reviewer lottery on bot PRs (#1250) (#1251)

---
 .github/workflows/reviewer_lottery.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/reviewer_lottery.yml b/.github/workflows/reviewer_lottery.yml
index 2edbc9b59e..ed28964e01 100644
--- a/.github/workflows/reviewer_lottery.yml
+++ b/.github/workflows/reviewer_lottery.yml
@@ -6,6 +6,7 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    if: github.actor != 'dependabot[bot]' && github.actor != 'mergify[bot]'
     steps:
     - uses: actions/checkout@v4
     - uses: uesteibar/reviewer-lottery@v3

From a9ed9223c8a015b570b2b9236144fa0d435e0fe7 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:39:13 +0000
Subject: [PATCH 3/4] Set ref explicitely for action-ros-ci (#1254) (#1258)

---
 .github/workflows/reusable-ros-tooling-source-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/reusable-ros-tooling-source-build.yml b/.github/workflows/reusable-ros-tooling-source-build.yml
index 525bb3cc57..c90e3eec67 100644
--- a/.github/workflows/reusable-ros-tooling-source-build.yml
+++ b/.github/workflows/reusable-ros-tooling-source-build.yml
@@ -36,6 +36,7 @@ jobs:
         with:
           target-ros2-distro: ${{ inputs.ros_distro }}
           # build all packages listed in the meta package
+          ref: ${{ inputs.ref }} # otherwise the default branch is used for scheduled workflows
           package-name:
             controller_interface
             controller_manager

From a04eb5d920b944b3475b53e1ead1c56e19ae58d7 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 18:42:03 +0000
Subject: [PATCH 4/4] [docs] Remove joint_state_controller (#1263) (#1264)

---
 controller_manager/controller_manager/launch_utils.py | 6 +++---
 ros2controlcli/doc/userdoc.rst                        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/controller_manager/controller_manager/launch_utils.py b/controller_manager/controller_manager/launch_utils.py
index d3f9356eae..e9adfaa50f 100644
--- a/controller_manager/controller_manager/launch_utils.py
+++ b/controller_manager/controller_manager/launch_utils.py
@@ -32,12 +32,12 @@ def generate_load_controller_launch_description(controller_name,
     Examples # noqa: D416
     --------
       # Assuming the controller type and controller parameters are known to the controller_manager
-      generate_load_controller_launch_description('joint_state_controller')
+      generate_load_controller_launch_description('joint_state_broadcaster')
 
       # Passing controller type and controller parameter file to load
       generate_load_controller_launch_description(
-        'joint_state_controller',
-        controller_type='joint_state_controller/JointStateController',
+        'joint_state_broadcaster',
+        controller_type='joint_state_broadcaster/JointStateBroadcaster',
         controller_params_file=os.path.join(get_package_share_directory('my_pkg'),
                                             'config', 'controller_params.yaml')
         )
diff --git a/ros2controlcli/doc/userdoc.rst b/ros2controlcli/doc/userdoc.rst
index bb21b7f005..ce16d237c5 100644
--- a/ros2controlcli/doc/userdoc.rst
+++ b/ros2controlcli/doc/userdoc.rst
@@ -73,7 +73,7 @@ Example output:
 
     $ ros2 control list_controller_types
     diff_drive_controller/DiffDriveController                              controller_interface::ControllerInterface
-    joint_state_controller/JointStateController                            controller_interface::ControllerInterface
+    joint_state_broadcaster/JointStateBroadcaster                          controller_interface::ControllerInterface
     joint_trajectory_controller/JointTrajectoryController                  controller_interface::ControllerInterface