Merge branch 'debian/liberty' of git+ssh://git.debian.org/git/openstack/heat into...

Conflicts:
	debian/control

Rewritten-From: 84d8f2ce31e1406c4ae709192d9ae0d1cd89b4b2

diff --cc trusty/debian/changelog
Simple merge

diff --cc trusty/debian/control
index 4f97b169d14b0ee25a99a3a0643e1fba38268e74,fa751deac2ec8aca476a76ac57fc67f90521c9b1..065a6f34e3ebfffed414739c8b306cccb74aee54
--- 1/trusty/debian/control
--- 2/trusty/debian/control
+++ b/trusty/debian/control
@@@ -9,18 -9,16 +9,18 @@@ Build-Depends: debhelper (>= 9)
                 openstack-pkg-tools (>= 23~),
                 po-debconf,
                 python-all,
 -               python-pbr (>= 1.3),
 +               python-pbr (>= 1.6),
                 python-setuptools,
                 python-sphinx,
 -Build-Depends-Indep: python-babel,
 -                     python-barbicanclient (>= 3.0.1),
 +Build-Depends-Indep: bandit (>= 0.13.2),
 +                     python-babel,
 +                     python-barbicanclient (>= 3.3.0),
-                      python-ceilometerclient (>= 1.0.13),
+                      python-ceilometerclient (>= 1.3.0),
                       python-cinderclient (>= 1:1.3.1),
 +                     python-croniter,
                       python-coverage,
                       python-crypto,
 -                     python-cryptography (>= 0.9.1),
 +                     python-cryptography (>= 1.0),
                       python-designateclient (>= 1.0.0),
                       python-eventlet (>= 0.17.4),
                       python-glanceclient (>= 1:0.18.0),
@@@ -72,9 -70,8 +72,9 @@@
                       python-stevedore (>= 1.5.0),
                       python-swiftclient,
                       python-testscenarios,
-                      python-testtools,
-                      python-troveclient (>= 1.2.0),
+                      python-testtools (>= 1.4.0),
+                      python-troveclient (>= 1:1.2.0),
 +                     python-tz,
                       python-webob,
                       python-yaml,
                       python-zaqarclient (>= 0.1.1),
@@@ -89,12 -86,11 +89,12 @@@ Package: python-hea
  Section: python
  Architecture: all
  Depends: python-babel (>= 1.3),
 -         python-barbicanclient (>= 3.0.1),
 +         python-barbicanclient (>= 3.3.0),
-          python-ceilometerclient (>= 1.0.13),
+          python-ceilometerclient (>= 1.3.0),
           python-cinderclient (>= 1:1.3.1),
 +         python-croniter,
           python-crypto,
 -         python-cryptography (>= 0.9.1),
 +         python-cryptography (>= 1.0),
           python-designateclient (>= 1.0.0),
           python-eventlet (>= 0.17.4),
           python-glanceclient (>= 1:0.18.0),
@@@ -112,18 -107,18 +112,18 @@@
           python-migrate (>= 0.9.6),
           python-mistralclient (>= 1.0.0),
           python-mysqldb,
 -         python-netaddr,
 -         python-neutronclient (>= 2.6.0),
 +         python-netaddr (>= 0.7.12),
-          python-neutronclient (>= 2.6.0),
++         python-neutronclient (>= 2:2.6.0),
           python-novaclient (>= 2:2.26.0),
 -         python-oslo.cache (>= 0.3.0),
 +         python-oslo.cache (>= 0.4.0),
           python-oslo.concurrency (>= 2.3.0),
 -         python-oslo.config (>= 1:1.11.0),
 +         python-oslo.config (>= 1:2.3.0),
           python-oslo.context (>= 0.2.0),
 -         python-oslo.db (>= 1.12.0),
 +         python-oslo.db (>= 2.4.1),
           python-oslo.i18n (>= 1.5.0),
 -         python-oslo.log (>= 1.6.0),
 +         python-oslo.log (>= 1.8.0),
           python-oslo.messaging (>= 1.16.0),
 -         python-oslo.middleware (>= 2.4.0),
 +         python-oslo.middleware (>= 2.8.0),
           python-oslo.policy (>= 0.5.0),
           python-oslo.reports,
           python-oslo.serialization (>= 1.4.0),
@@@ -141,8 -136,7 +141,8 @@@
           python-sqlalchemy,
           python-stevedore (>= 1.5.0),
           python-swiftclient,
-          python-troveclient (>= 1.2.0),
+          python-troveclient (>= 1:1.2.0),
 +         python-tz,
           python-webob,
           python-yaml,
           python-zaqarclient (>= 0.1.1),