Merge "Move Dockerfile to ./docker path"
authorkong wei <kong.wei2@zte.com.cn>
Sun, 19 Feb 2017 14:59:13 +0000 (14:59 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sun, 19 Feb 2017 14:59:13 +0000 (14:59 +0000)

Trivial merge