Merge "Bugfix: HA kill process recovery has a conflict" into stable/fraser
authorJing Lu <lvjing5@huawei.com>
Thu, 28 Jun 2018 07:36:33 +0000 (07:36 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 28 Jun 2018 07:36:33 +0000 (07:36 +0000)

Trivial merge