Merge "add the combination of IOC and dropwizard code"
authorHuabingZhao <zhao.huabing@zte.com.cn>
Tue, 24 Jan 2017 00:24:40 +0000 (00:24 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Tue, 24 Jan 2017 00:24:40 +0000 (00:24 +0000)

Trivial merge