Merge lp:~yolanda.robla/glance/grizzly into lp:~openstack-ubuntu-testing/glance/grizzly

[Yolanda Robla]

Updated changelog, removed unused patches

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-17 10:14:40 +0000
+++ debian/changelog	2013-01-03 15:58:59 +0000
@@ -1,9 +1,8 @@
-glance (2013.1~g2~20121215.46.gbeb1536-0ubuntu1) UNRELEASED; urgency=low
+glance (2013.1~g2~20130103.63.g48cf125-0ubuntu1) UNRELEASED; urgency=low
 
   [ James Page ]
   * New upstream release.
   * Re-enable gating of package build based on unit test success:
-    - d/p/webob_1.1_compat.patch: Patch for compatibility with webob 1.1.
     - d/rules: Enable build failure on unit testing failure, scope
       test execution to glance/tests.
   * Switched upstart configurations to use start-stop-daemon instead of su.
@@ -16,6 +15,9 @@
   * debian/*.manpages: Install Sphinx-generated manpages for binaries
     installed by glance-common, glance-registry, and glance-api.
 
+  [ Yolanda Robla Mota ]
+  * Updated package version
+
  -- Adam Gandelman <[e-mail]>  Wed, 05 Dec 2012 11:12:37 -0800
 
 glance (2013.1~g1-0ubuntu1) raring; urgency=low
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-26 13:36:21 +0000
+++ debian/patches/series	2013-01-03 15:58:59 +0000
@@ -1,3 +1,2 @@
 sql_conn.patch
 disable-network-for-docs.patch
-webob_1.1_compat.patch
 
=== removed file 'debian/patches/webob_1.1_compat.patch'
--- debian/patches/webob_1.1_compat.patch	2012-12-17 08:33:27 +0000
+++ debian/patches/webob_1.1_compat.patch	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-Description: webob 1.1 compatibility fixes.
- Some behaviour changes between 1.0.8 and 1.1 cause test
- failures; specifically:
- .
-  - when app_iter is used for chunked transfers the
-    Content-MD5 header is dropped automatically; this
-    might be a bug in webob but setting the MD5 after
-    providing the iterator fixes the issue for the time
-    being.
- .
- Upstream openstack still baseline on 1.0.8 so Ubuntu will
- need to hold this patch until they upgrade.
-Author: James Page <[e-mail]>
-Forwarded: no
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-webob/+bug/1083155
-
---- a/glance/api/v2/image_data.py
-+++ b/glance/api/v2/image_data.py
-@@ -137,10 +137,11 @@ class ResponseSerializer(wsgi.JSONRespon
-         checksum = result['meta']['checksum']
-         response.headers['Content-Length'] = size
-         response.headers['Content-Type'] = 'application/octet-stream'
--        if checksum:
--            response.headers['Content-MD5'] = checksum
-         response.app_iter = common.size_checked_iter(
-                 response, result['meta'], size, result['data'], self.notifier)
-+        if checksum:
-+            response.headers['Content-MD5'] = checksum
-+
- 
-     def upload(self, response, result):
-         response.status_int = 201