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

k-okada · May 10, 2018 · 18829d3 · 18829d3
2 parents f31383f + 3c69aa5
commit 18829d3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis b/.travis
diff --git a/hrpsys_ros_bridge/test/test-pa10.test b/hrpsys_ros_bridge/test/test-pa10.test
@@ -1,10 +1,10 @@
 <launch>
 
   <arg name="GUI" default="false" />
-  <node name="start_omninames" pkg="rtmbuild" type="start_omninames.sh" args="2809" />
+  <node name="start_omninames" pkg="rtmbuild" type="start_omninames.sh" args="2899" />
 
   <include file="$(find hrpsys_ros_bridge)/launch/pa10.launch" >
-    <arg name="corbaport" default="2809" />
+    <arg name="corbaport" default="2899" />
     <arg name="GUI" default="$(arg GUI)" />
     <arg name="RUN_RVIZ" default="false" />
     <arg name="SIMULATOR_NAME" default="HRP1(Robot)0" />

diff --git a/hrpsys_ros_bridge/test/test-samplerobot.test b/hrpsys_ros_bridge/test/test-samplerobot.test
@@ -1,9 +1,9 @@
 <launch>
 
-  <node name="start_omninames" pkg="rtmbuild" type="start_omninames.sh" args="2809" />
+  <node name="start_omninames" pkg="rtmbuild" type="start_omninames.sh" args="2898" />
 
   <include file="$(find hrpsys_ros_bridge)/launch/samplerobot.launch" >
-    <arg name="corbaport" default="2809" />
+    <arg name="corbaport" default="2898" />
     <arg name="GUI" default="false" />
     <arg name="RUN_RVIZ" default="false" />
   </include>
+6 −0		.travis.yml
+56 −0		CHANGELOG.rst
+5 −1		README.md
+1 −1		docker.sh
+1 −1		package.xml
+3 −0		rosdep-install.sh
+28 −25		travis.sh
+5 −7		travis_jenkins.py