Merge "Bring in Tacker salt formula"
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 8 Jun 2018 15:24:50 +0000 (15:24 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 8 Jun 2018 15:24:50 +0000 (15:24 +0000)

Trivial merge