Merge "bugfix: opencontrail remove nova para modification in nova.conf on controller...
authorchenshuai@huawei.com <chenshuai@huawei.com>
Thu, 21 Jan 2016 08:33:19 +0000 (08:33 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 21 Jan 2016 08:33:19 +0000 (08:33 +0000)

Trivial merge