Merge "Update setting up ONAP" into beijing
authorEric Debeau <eric.debeau@orange.com>
Tue, 5 Jun 2018 23:22:01 +0000 (23:22 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 5 Jun 2018 23:22:01 +0000 (23:22 +0000)

Trivial merge