Merge "Update catalog oparent to 2.1.0"
authorFu Jinhua <fu.jinhua@zte.com.cn>
Mon, 21 Oct 2019 02:01:31 +0000 (02:01 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 21 Oct 2019 02:01:31 +0000 (02:01 +0000)

Trivial merge