Merge changes I83c64de0,Ifa520a21 into stable/gambia
authorCedric Ollivier <cedric.ollivier@orange.com>
Thu, 13 Sep 2018 09:41:59 +0000 (09:41 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 13 Sep 2018 09:41:59 +0000 (09:41 +0000)
* changes:
  Update .travis.yml
  Fix BRANCH in Dockerfile


Trivial merge