Merge "Update docker information"
authorYujun Zhang <zhang.yujunz@zte.com.cn>
Wed, 26 Oct 2016 10:16:09 +0000 (10:16 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 26 Oct 2016 10:16:09 +0000 (10:16 +0000)

Trivial merge