Merge changes I95651dbd,If52f42c5
authormarchettim <mmarchetti@sandvine.com>
Tue, 20 Nov 2018 20:42:58 +0000 (21:42 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Tue, 20 Nov 2018 20:42:58 +0000 (21:42 +0100)
commitaa4905206a547169672d45300102afd5709992ae
tree9dff06e1408e2cbbc49f7dd3bb514e7c0f0a8024
parent95c0173af060c3f475fdac79c4480d6ba38bf39b
parent5c78e636753044e1cd39b06fb154556e090591a3
Merge changes I95651dbd,If52f42c5

* changes:
  Rename juju-charms -> charms
  An example of a multi-charm, multi-vdu VNF