Merge "jenkins conf"
authorRuan HE <ruan.he@orange.com>
Wed, 17 Jan 2018 13:36:33 +0000 (13:36 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 17 Jan 2018 13:36:33 +0000 (13:36 +0000)

Trivial merge