Merge lp:~zulcss/nova/webob into lp:~ubuntu-server-dev/nova/icehouse

[Chuck Short]

webob dependency bump

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-11 14:07:07 +0000
+++ debian/changelog	2013-12-12 14:10:04 +0000
@@ -3,7 +3,8 @@
   [ Chuck Short ]
   * debian/patches/fix-libvirt-regression.patch: Dropped.
   * debian/patches/sqlachemy-0.8.3-compat.patch: Refreshed.
-  * debian/control: Add python-pycadf as ad dependency.
+  * debian/control: Add python-pycadf as a dependency.
+  * debian/patches/fix-requirements.patch: Refreshed
 
   [ James Page ]
   * d/nova-compute-*.conf: Update default hypervisor configurations

=== removed file 'debian/patch-branches'
=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2013-12-11 12:08:35 +0000
+++ debian/patches/fix-requirements.patch	2013-12-12 14:10:04 +0000
@@ -1,3 +1,5 @@
+diff --git a/requirements.txt b/requirements.txt
+index de6d606..fb99aa3 100644
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -1,5 +1,5 @@
@@ -7,6 +9,15 @@
  amqplib>=0.6.1
  anyjson>=0.3.3
  argparse
+@@ -9,7 +9,7 @@ Jinja2
+ kombu>=2.4.8
+ lxml>=2.3
+ Routes>=1.12.3
+-WebOb>=1.2.3,<1.3
++WebOb>=1.2.3,<=1.3
+ greenlet>=0.3.2
+ PasteDeploy>=1.5.0
+ Paste
 @@ -27,6 +27,5 @@ python-glanceclient>=0.9.0
  python-keystoneclient>=0.4.1
  six>=1.4.1
@@ -14,3 +25,4 @@
 -websockify>=0.5.1,<0.6
  oslo.config>=1.2.0
  pycadf>=0.1.9
+