Merge lp:~gandelman-a/ubuntu/vivid/ironic/lp1391960 into lp:~ubuntu-server-dev/ironic/kilo

[Adam Gandelman]

[James Page (james-page)]

Thanks Adam!

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-28 15:04:46 +0000
+++ debian/changelog	2014-11-13 17:17:23 +0000
@@ -1,9 +1,14 @@
-ironic (2014.2-0ubuntu2) UNRELEASED; urgency=medium
+ironic (2014.2-0ubuntu3) UNRELEASED; urgency=medium
 
+  [ Chuck Short ]
   * Open up for vivid.
-  * debian/control: Update bzr branch 
-
- -- Chuck Short <[e-mail]>  Tue, 28 Oct 2014 11:03:52 -0400
+  * debian/control: Update bzr branch
+
+  [ Adam Gandelman ]
+  * debian/control: Add python-sendfile to python-ironic dependencies, set
+    version requirements according to upstream requirements.txt (LP: #1391960).
+
+ -- Adam Gandelman <[e-mail]>  Thu, 13 Nov 2014 09:15:39 -0800
 
 ironic (2014.2-0ubuntu1) utopic; urgency=medium
 
 
=== modified file 'debian/control'
--- debian/control	2014-10-28 15:04:46 +0000
+++ debian/control	2014-11-13 17:17:23 +0000
@@ -40,7 +40,7 @@
  python-posix-ipc,
  python-pyghmi,
  python-retrying (>= 1.2.2),
- python-sendfile,
+ python-sendfile (== 2.0.0),
  python-setuptools,
  python-six (>= 1.7.0),
  python-sqlalchemy (>= 0.7.8),
@@ -88,6 +88,7 @@
  python-pecan (>= 0.5.0),
  python-pyghmi,
  python-retrying (>= 1.2.2),
+ python-sendfile (== 2.0.0),
  python-six (>= 1.7.0),
  python-sqlalchemy (>= 0.7.8),
  python-stevedore (>= 1.0.0),