Merge "Bugfix: HA kill process recovery has a conflict"
authorAbhijit Sinha <abhijit.sinha@intel.com>
Tue, 26 Jun 2018 15:15:02 +0000 (15:15 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 26 Jun 2018 15:15:02 +0000 (15:15 +0000)

Trivial merge