Merge branch 'debian/havana' of ssh://git.debian.org/git/openstack/neutron into debia...

Conflicts:
	debian/control

Rewritten-From: 08ff2e2eaff2ed07458ef078d723e0bc6f3910d3

diff --cc trusty/debian/control
index c79ed063e27d134d85a26e056c48cfc89228091e,154fd3c01f1981789bd0ae4be55f6582126ffe19..87340987c737caa19d19d229e79df5368e217910
--- 1/trusty/debian/control
--- 2/trusty/debian/control
+++ b/trusty/debian/control
@@@ -36,11 -36,11 +36,11 @@@ Build-Depends-Indep: alembic (>= 0.4.1)
                       python-mox,
                       python-netaddr,
                       python-netifaces,
 -                     python-neutronclient (>= 2.2.3),
 +                     python-neutronclient (>= 2.3.0),
                       python-nose,
                       python-nosexcover,
 -                     python-novaclient (>= 2:2.12.0),
 +                     python-novaclient (>= 2:2.15.0),
-                      python-oslo.config (>= 1.2.0a3),
+                      python-oslo.config (>= 1.2.1),
                       python-paste,
                       python-pastedeploy,
                       python-pyudev,
@@@ -116,9 -116,9 +116,8 @@@ Depends: alembic (>= 0.4.1)
           python-lxml,
           python-migrate,
           python-netaddr,
-          python-neutronclient (>= 2.3.0),
-          python-novaclient (>= 2:2.15.0),
 -         python-neutronclient (>= 2.2.3),
 -         python-novaclient (>= 2:2.12.0),
 +         python-oslo.config (>= 1.2.0a3),
+          python-oslo.config (>= 1.2.1),
           python-paste,
           python-pastedeploy,
           python-pbr (>= 0.5.21),