Merge remote-tracking branch 'origin/master' into scaled_jtc

joint_trajectory_controller/src/joint_trajectory_controller.cpp

@@ -949,7 +949,7 @@ controller_interface::CallbackReturn JointTrajectoryController::on_activate(
   params_ = param_listener_->get_params();
 
   // parse remaining parameters
-  default_tolerances_ = get_segment_tolerances(params_);
+  default_tolerances_ = get_segment_tolerances(logger, params_);
   // Setup time_data buffer used for scaling
   TimeData time_data;
   time_data_.time = get_node()->now();