From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 1 Aug 2015 00:48:44 +0000 (+0000)
Subject: Merge "Arista Drivers decomposition part II"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7b3abffc2c8d4ab6399224ab09731f4d5b327d62;p=openstack-build%2Fneutron-build.git

Merge "Arista Drivers decomposition part II"
---

7b3abffc2c8d4ab6399224ab09731f4d5b327d62
diff --cc neutron/db/migration/models/head.py
index 6044cd4ab,43eb02ee4..8680b06a4
--- a/neutron/db/migration/models/head.py
+++ b/neutron/db/migration/models/head.py
@@@ -52,9 -52,9 +52,8 @@@ from neutron.plugins.brocade.db import 
  from neutron.plugins.cisco.db.l3 import l3_models  # noqa
  from neutron.plugins.cisco.db import n1kv_models_v2  # noqa
  from neutron.plugins.cisco.db import network_models_v2  # noqa
- from neutron.plugins.ml2.drivers.arista import db  # noqa
  from neutron.plugins.ml2.drivers.brocade.db import (  # noqa
      models as ml2_brocade_models)
 -from neutron.plugins.ml2.drivers.cisco.n1kv import n1kv_models  # noqa
  from neutron.plugins.ml2.drivers.cisco.nexus import (  # noqa
      nexus_models_v2 as ml2_nexus_models_v2)
  from neutron.plugins.ml2.drivers.cisco.ucsm import ucsm_model  # noqa