Merge "Fix deploy issue in common-tosca-catalog httpserver"
authorJian Huang <huang.jian12@zte.com.cn>
Sat, 3 Sep 2016 06:00:06 +0000 (06:00 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Sat, 3 Sep 2016 06:00:06 +0000 (06:00 +0000)

Trivial merge