Merge "Update Configuration guide"
authorMorgan Richomme <morgan.richomme@orange.com>
Wed, 1 Feb 2017 13:18:25 +0000 (13:18 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 1 Feb 2017 13:18:25 +0000 (13:18 +0000)

Trivial merge