Merge "bugfix: autoupdate failed due to mingle with watchdog"
authorMorgan Richomme <morgan.richomme@orange.com>
Thu, 21 Sep 2017 12:38:29 +0000 (12:38 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 21 Sep 2017 12:38:29 +0000 (12:38 +0000)

Trivial merge