From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 15 Aug 2012 07:52:31 +0000 (+0000)
Subject: Merge "Convert DHCP from polling to RPC"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d8a4c1c7f52be6315473c47f4d874a91caa655c5;p=openstack-build%2Fneutron-build.git

Merge "Convert DHCP from polling to RPC"
---

d8a4c1c7f52be6315473c47f4d874a91caa655c5
diff --cc quantum/plugins/openvswitch/ovs_quantum_plugin.py
index 2c4dbb8d4,0e47963c5..06d4592ac
--- a/quantum/plugins/openvswitch/ovs_quantum_plugin.py
+++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
@@@ -27,8 -27,10 +27,9 @@@ from quantum.api import api_commo
  from quantum.api.v2 import attributes
  from quantum.common import exceptions as q_exc
  from quantum.common import topics
 -from quantum.common.utils import find_config_file
  from quantum.db import api as db
  from quantum.db import db_base_plugin_v2
+ from quantum.db import dhcp_rpc_base
  from quantum.db import models_v2
  from quantum.openstack.common import context
  from quantum.openstack.common import cfg