From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 10 Jun 2015 20:25:16 +0000 (+0000)
Subject: Merge "Handle SIGHUP: neutron-server (multiprocess) and metadata agent"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a3226a405c3850f56f9f3d9c4dde28c55537cbd5;p=openstack-build%2Fneutron-build.git

Merge "Handle SIGHUP: neutron-server (multiprocess) and metadata agent"
---

a3226a405c3850f56f9f3d9c4dde28c55537cbd5
diff --cc neutron/tests/functional/requirements.txt
index 2d664cb35,f98f475bc..2f9131d0b
--- a/neutron/tests/functional/requirements.txt
+++ b/neutron/tests/functional/requirements.txt
@@@ -4,5 -4,6 +4,6 @@@
  # of appearance. Changing the order has an impact on the overall integration
  # process, which may cause wedges in the gate later.
  
+ psutil>=1.1.1,<2.0.0
  psycopg2
 -MySQL-python
 +PyMySQL>=0.6.2  # MIT License