Merge "Place config_functest.yaml outside the functest repo"
authorMorgan Richomme <morgan.richomme@orange.com>
Wed, 13 Jan 2016 10:52:06 +0000 (10:52 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 13 Jan 2016 10:52:06 +0000 (10:52 +0000)
1  2 
docker/prepare_env.sh

Simple merge