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)
commit6fda20c0f122ab25d5034a7365a116fcc58044d9
treecb676cb82055314700196b41c835d35640567a61
parent7d48c511445c147bd81134005006e09dba6bd820
parent0392aa3f439a5ef4cdda3f30e3418612ddbdef6e
Merge changes I83c64de0,Ifa520a21 into stable/gambia

* changes:
  Update .travis.yml
  Fix BRANCH in Dockerfile