From 27ab80133265e5171bb9b27711b72cb0bda5dcd3 Mon Sep 17 00:00:00 2001
From: Mike Lautman <mikeblautman@github.com>
Date: Mon, 25 Mar 2019 13:47:43 -0600
Subject: [PATCH] changing branch from moveit2-ci to master in prep for merge

---
 .docker/ci/Dockerfile     | 2 +-
 .docker/source/Dockerfile | 2 +-
 moveit.rosinstall         | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.docker/ci/Dockerfile b/.docker/ci/Dockerfile
index 0050d8ee60..8d8f663224 100644
--- a/.docker/ci/Dockerfile
+++ b/.docker/ci/Dockerfile
@@ -70,7 +70,7 @@ RUN apt-get -qq update && \
 RUN mkdir src && \
     cd $ROS_WS/src && \
     # TODO(mlautman): This should be changed to use vcs in the future
-    wstool init --shallow . https://raw.githubusercontent.com/ros-planning/moveit2/moveit2-ci/moveit.rosinstall
+    wstool init --shallow . https://raw.githubusercontent.com/ros-planning/moveit2/master/moveit.rosinstall
 
 # Download all MoveIt dependencies
 RUN \
diff --git a/.docker/source/Dockerfile b/.docker/source/Dockerfile
index 17a8d273b0..56fbc23675 100644
--- a/.docker/source/Dockerfile
+++ b/.docker/source/Dockerfile
@@ -10,7 +10,7 @@ RUN mkdir src && \
     cd src && \
     #
     # Download moveit source so that we can get necessary dependencies
-    wstool init . https://raw.githubusercontent.com/ros-planning/moveit2/moveit2-ci/moveit.rosinstall
+    wstool init . https://raw.githubusercontent.com/ros-planning/moveit2/master/moveit.rosinstall
 
 # Update apt package list as cache is cleared in previous container
 # Usually upgrading involves a few packages only (if container builds became out-of-sync)
diff --git a/moveit.rosinstall b/moveit.rosinstall
index 171bd86eb2..86e77ad2e1 100644
--- a/moveit.rosinstall
+++ b/moveit.rosinstall
@@ -4,8 +4,7 @@
 - git:
     local-name: moveit2
     uri: https://github.com/ros-planning/moveit2.git
-    version: moveit2-ci
-
+    version: master
 - git:
     local-name: moveit_msgs
     # TODO(mlautman): update to ros-planning once the package has been merged back in