Merge "Update test_combine_url"
authorLiang Ke <lokyse@163.com>
Mon, 26 Mar 2018 08:57:39 +0000 (08:57 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 26 Mar 2018 08:57:39 +0000 (08:57 +0000)

Trivial merge