Merge "Fix bug in removing docker containers and images"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Tue, 3 Jan 2017 08:01:59 +0000 (08:01 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 3 Jan 2017 08:01:59 +0000 (08:01 +0000)

Trivial merge