Merge "Bugfix: HA kill process recovery has a conflict"
[yardstick.git] / yardstick / resources / __init__.py