Merge "enable onos in joid deployment"
authorJun Li <matthew.lijun@huawei.com>
Tue, 12 Jan 2016 03:07:58 +0000 (03:07 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 12 Jan 2016 03:07:58 +0000 (03:07 +0000)

Trivial merge