Merge "bugfix: opencontrail neutron and nova plugins code"
authorchenshuai@huawei.com <chenshuai@huawei.com>
Sun, 17 Jan 2016 12:28:08 +0000 (12:28 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Sun, 17 Jan 2016 12:28:08 +0000 (12:28 +0000)

Trivial merge