From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 1 Mar 2014 01:30:57 +0000 (+0000)
Subject: Merge "Ensure ovsdb-client is stopped when OVS agent dies"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e33e6b78fe730533b141f3dbeb16375e4fd2d8e0;p=openstack-build%2Fneutron-build.git

Merge "Ensure ovsdb-client is stopped when OVS agent dies"
---

e33e6b78fe730533b141f3dbeb16375e4fd2d8e0
diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
index ec9f5be13,2f5934a6a..d1fe5f96a
--- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
@@@ -13,8 -14,16 +13,9 @@@
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
 -# @author: Somik Behera, Nicira Networks, Inc.
 -# @author: Brad Hall, Nicira Networks, Inc.
 -# @author: Dan Wendlandt, Nicira Networks, Inc.
 -# @author: Dave Lapsley, Nicira Networks, Inc.
 -# @author: Aaron Rosen, Nicira Networks, Inc.
 -# @author: Seetharama Ayyadevara, Freescale Semiconductor, Inc.
 -# @author: Kyle Mestery, Cisco Systems, Inc.
  
  import distutils.version as dist_version
+ import signal
  import sys
  import time