Merge "bugfix:remove openvswitch when enable opencontrail"
authorchenshuai@huawei.com <chenshuai@huawei.com>
Sat, 27 Feb 2016 02:08:33 +0000 (02:08 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Sat, 27 Feb 2016 02:08:33 +0000 (02:08 +0000)

Trivial merge