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)
commit441d5f55a6e2e155d01d4b396678d0d09bfb8413
tree98178f047f6ed9e739c3e003d6c437a6eeba915e
parent405385acf890856390eb321cd1fc96c19ebfda0d
parentc9a9dcae22045cb0392f8445d9d4e00753f934b5
Merge "Bugfix: HA kill process recovery has a conflict" into stable/fraser