From: Morgan Richomme <morgan.richomme@orange.com>
Date: Thu, 14 Jan 2016 08:07:30 +0000 (+0000)
Subject: Merge "Change functest branch to stable/brahmaputra"
X-Git-Tag: colorado.1.0~650
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5c35c622d11f309f8e1f7eddf5f50112fc3b7298;p=functest.git

Merge "Change functest branch to stable/brahmaputra"
---

5c35c622d11f309f8e1f7eddf5f50112fc3b7298
diff --cc docker/Dockerfile
index 4b89264e7,0d2cfb4f7..4a2d87bf6
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -74,4 -74,5 +74,4 @@@ ADD http://download.cirros-cloud.net/0.
  
  RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
  RUN curl -L https://get.rvm.io | bash -s stable
- RUN bash -c 'source /etc/profile.d/rvm.sh ; rvm autolibs enable ; rvm install 1.9.3 ; rvm use 1.9.3'
+ RUN bash -c 'source /etc/profile.d/rvm.sh ; rvm autolibs enable ; rvm install 1.9.3 ; rvm use 1.9.3'
 -RUN bash -c 'source /etc/profile.d/rvm.sh ; cd ${repos_dir}/vims-test;rvm use system;bundle install'