Merge lp:~zulcss/ironic/2014.1.b2 into lp:~ubuntu-server-dev/ironic/icehouse

[Chuck Short]

2014.1.b2

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-17 14:47:37 +0000
+++ debian/changelog	2014-01-24 15:03:23 +0000
@@ -1,3 +1,12 @@
+ironic (2014.1~b2-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release.
+  * debian/control: Add python-oslo.rootwrap.
+  * debian/patches/fix-requirements.patch: Adjust dependencies
+    for sqlalchemy and webob.
+
+ -- Chuck Short <[e-mail]>  Fri, 24 Jan 2014 10:01:25 -0500
+
 ironic (0.0~git20140117-0ubuntu1) trusty; urgency=low
 
   * Initial release.
 
=== modified file 'debian/control'
--- debian/control	2014-01-24 14:42:48 +0000
+++ debian/control	2014-01-24 15:03:23 +0000
@@ -24,6 +24,7 @@
  python-stevedore (>= 0.12),
  websockify,
  python-oslo.config (>= 1.2.0),
+ python-oslo.rootwrap,
  python-pecan (>= 0.2.0),
  python-six (>= 1.4.1),
  python-jsonpatch (>= 1.1),
 
=== added directory 'debian/patches'
=== added file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requirements.patch	2014-01-24 15:03:23 +0000
@@ -0,0 +1,21 @@
+Description: Fix requirements on Ubuntu.
+Author: Chuck Short <[e-mail]>
+Forwarded: Not-needed
+diff -Naurp ironic-2014.1.b2.orig/requirements.txt ironic-2014.1.b2/requirements.txt
+--- ironic-2014.1.b2.orig/requirements.txt	2014-01-23 11:15:29.000000000 -0500
++++ ironic-2014.1.b2/requirements.txt	2014-01-24 09:54:48.908969175 -0500
+@@ -1,12 +1,12 @@
+ pbr>=0.5.21,<1.0
+-SQLAlchemy>=0.7.8,<=0.7.99
++SQLAlchemy>=0.7.8,<=0.8.99
+ amqplib>=0.6.1
+ anyjson>=0.3.3
+ argparse
+ eventlet>=0.13.0
+ kombu>=2.4.8
+ lxml>=2.3
+-WebOb>=1.2.3,<1.3
++WebOb>=1.2.3
+ greenlet>=0.3.2
+ sqlalchemy-migrate>=0.8.2
+ netaddr>=0.7.6
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-01-24 15:03:23 +0000
@@ -0,0 +1,1 @@
+fix-requirements.patch