Merge "set timer on the compass+onos and compass+odl job"
authorJun Li <matthew.lijun@huawei.com>
Tue, 19 Jan 2016 12:31:49 +0000 (12:31 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 19 Jan 2016 12:31:49 +0000 (12:31 +0000)

Trivial merge