Merge "Upversion the esr server to 1.2.0"
authorLi Zi <li.zi30@zte.com.cn>
Wed, 25 Jul 2018 01:00:58 +0000 (01:00 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 25 Jul 2018 01:00:58 +0000 (01:00 +0000)

Trivial merge