Merge "Add zhifeng ssh_key"
authorzhifeng jiang <jiang.zhifeng@zte.com.cn>
Tue, 25 Oct 2016 00:59:22 +0000 (00:59 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 25 Oct 2016 00:59:22 +0000 (00:59 +0000)

Trivial merge