Merge "Edit the docker file and adjust HA yml"
authorshuai chen <chenshuai@huawei.com>
Tue, 25 Oct 2016 06:33:25 +0000 (06:33 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 25 Oct 2016 06:33:25 +0000 (06:33 +0000)

Trivial merge