Merge "bugfix: opencontrail parameter network_api_class in nova.conf to nova.network...
authorchenshuai@huawei.com <chenshuai@huawei.com>
Thu, 14 Jan 2016 07:59:02 +0000 (07:59 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 14 Jan 2016 07:59:02 +0000 (07:59 +0000)

Trivial merge