Merge "Offline deployment fails on jumphost with docker installed" into stable/colorado
authorJustin chi <chigang@huawei.com>
Mon, 28 Nov 2016 06:59:11 +0000 (06:59 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 28 Nov 2016 06:59:11 +0000 (06:59 +0000)

Trivial merge