Merge lp:~yolanda.robla/glance/precise-essex-proposed into lp:~openstack-ubuntu-testing/glance/precise-essex-proposed

[Yolanda Robla]

Resynchronize with stable/essex (LP: #1089488)

[lp:~yolanda.robla/glance/precise-essex-proposed]

175. By Yolanda Robla on 2013-04-11

  - [74b067d] v1 api returns location as header for cached images LP: 1135541
  - CVE-2013-1840
    LP: 1098962 (CVE-2013-0212)

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-17 10:59:15 +0000
+++ debian/changelog	2013-04-11 07:32:55 +0000
@@ -1,23 +1,25 @@
-glance (2012.1.4+stable-20121217-efd7e75b-0ubuntu1) precise-proposed; urgency=low
+glance (2012.1.4+stable-20130405-74b067df-0ubuntu1) precise-proposed; urgency=low
 
   [ Adam Gandelman ]
   * debian/glance-{registry, api}.logrotate: Fix incorrect logfile
     locations. (LP: #1049314)
 
-  [ Yolanda Robla ]
+  [ Yolanda Robla Mota ]
   * debian/rules: skipping pep8 tests to allow building
-
-  [ Yolanda Robla Mota ]
-  * Resynchronize with stable/essex (efd7e75b):
+  * Resynchronize with stable/essex (LP: #1089488):
+    - [74b067d] v1 api returns location as header for cached images LP: 1135541 
+    - CVE-2013-1840
+    - [37d4d96] glance image-download can display backend Swift password
+      LP: 1098962 (CVE-2013-0212)
     - [efd7e75] Non-admin users can cause public glance images to be deleted
-      from the backend storage repository (CVE-2012-4573)
+      from the backend storage repository (LP: #1065187)
     - [e6be061] Jenkins jobs fail because of incompatibility between sqlalchemy-
       migrate and the newest sqlalchemy-0.8.0b1 (LP: #1073569)
 
   * Dropped patches, superseeded by snapshot:
     - debian/patches/CVE-2012-4573.patch: [efd7e75]
 
- -- Yolanda Robla Mota <[e-mail]>  Mon, 17 Dec 2012 10:56:46 +0000
+ -- Yolanda Robla Mota <[e-mail]>  Fri, 05 Apr 2013 09:56:36 +0100
 
 glance (2012.1.3+stable~20120821-120fcf-0ubuntu1.2) precise-security; urgency=low