From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 9 May 2014 21:22:55 +0000 (+0000)
Subject: Merge "Add support to dynamically upload drivers in PLUMgrid plugin"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3133c7340ec1bc7906bf09a6e114602bcfcdd590;p=openstack-build%2Fneutron-build.git

Merge "Add support to dynamically upload drivers in PLUMgrid plugin"
---

3133c7340ec1bc7906bf09a6e114602bcfcdd590
diff --cc neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py
index 61604bf55,c017e44e6..330c98b41
--- a/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py
+++ b/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py
@@@ -36,10 -36,9 +36,9 @@@ from neutron.extensions import portbind
  from neutron.openstack.common import importutils
  from neutron.openstack.common import log as logging
  from neutron.plugins.plumgrid.common import exceptions as plum_excep
 -from neutron.plugins.plumgrid.plumgrid_plugin.plugin_ver import VERSION
 +from neutron.plugins.plumgrid.plumgrid_plugin import plugin_ver
  
  LOG = logging.getLogger(__name__)
- PLUM_DRIVER = 'neutron.plugins.plumgrid.drivers.plumlib.Plumlib'
  
  director_server_opts = [
      cfg.StrOpt('director_server', default='localhost',