Merge changes I9eb1a3e2,I212e61d2
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 20 Nov 2018 17:27:18 +0000 (18:27 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Tue, 20 Nov 2018 17:27:18 +0000 (18:27 +0100)
commit1c0180cdcb669271beb919ad414389c692272229
treea9f0b53baa69913469728140bd75b3eb41b4fe34
parent14017e5bc526517f611b30f2004a830843679153
parentb11bbba4d4ff91523fce9baafd3a13fe37acb04f
Merge changes I9eb1a3e2,I212e61d2

* changes:
  Bug fix in stage 3 related to repo_base_url
  hackfest_basic_vnfd: added alternative-image for aws