Merge remote-tracking branch 'origin/feature/rviz_plugin' into featur…

…e/rviz_plugin
sivasriram2112 · Aug 19, 2016 · 0b4c0c3 · 0b4c0c3
2 parents ea4a343 + 6e18982
commit 0b4c0c3
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,11 +12,10 @@ env:
     - ROS_DISTRO_NAME=kinetic OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64
 install:
   # either install the latest released version of ros_buildfarm
-  # (TODO the current release 1.0.1 is not sufficient so for now use the master branch)
-  #- pip install ros_buildfarm
+  - pip install ros_buildfarm
   # or checkout a specific branch
-  - git clone -b master https://github.com/ros-infrastructure/ros_buildfarm /tmp/ros_buildfarm
-  - pip install /tmp/ros_buildfarm
+  #- git clone -b master https://github.com/ros-infrastructure/ros_buildfarm /tmp/ros_buildfarm
+  #- pip install /tmp/ros_buildfarm
   # checkout catkin for catkin_test_results script
   - git clone https://github.com/ros/catkin /tmp/catkin
   # run devel job for a ROS repository with the same name as this repo