Merge "Integration of orchestra project"
authorMorgan Richomme <morgan.richomme@orange.com>
Fri, 3 Mar 2017 16:48:58 +0000 (16:48 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 3 Mar 2017 16:48:58 +0000 (16:48 +0000)

Trivial merge