summaryrefslogtreecommitdiffstats
path: root/etc/__init__.py
diff options
context:
space:
mode:
authorJing Lu <lvjing5@huawei.com>2018-06-28 07:36:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-06-28 07:36:33 +0000
commit441d5f55a6e2e155d01d4b396678d0d09bfb8413 (patch)
tree98178f047f6ed9e739c3e003d6c437a6eeba915e /etc/__init__.py
parent405385acf890856390eb321cd1fc96c19ebfda0d (diff)
parentc9a9dcae22045cb0392f8445d9d4e00753f934b5 (diff)
Merge "Bugfix: HA kill process recovery has a conflict" into stable/fraser
Diffstat (limited to 'etc/__init__.py')
0 files changed, 0 insertions, 0 deletions