Merge lp:~gandelman-a/ubuntu/quantal/glance/2012.2.4 into lp:~openstack-ubuntu-testing/glance/folsom

[Adam Gandelman]

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-22 13:23:06 +0000
+++ debian/changelog	2013-04-26 01:06:31 +0000
@@ -1,8 +1,33 @@
 glance (2012.2.4-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Adam Gandelman ]
+  * Dropped patches, applied upstream:
+    - debian/patches/CVE-2013-1840.patch: [dd849a9]
+  * Resynchronize with stable/folsom (dbd3d3d7):
+    - [cfaa2d8] repeated deletion on image member does not result in 404
+      LP: 1157427
+    - [5b4d21d] glance-cache-prefetcher explodes when no auth parameters were
+      configured LP: 1157765
+    - [dd849a9] v1 api returns location as header for cached images LP: 1135541
+    - [04f88c8] 500 error returned when an Admin tries to delete membership of
+      image from a non-existent /invalid tenant LP: 1060868
+    - [5597697] Fragile Test:
+      glance.tests.functional.test_bin_glance:TestBinGlance.test_update_copying_from
+      LP: 1107768
+    - [5183360] filesystem store does not clean up after premature termination
+      of image upload LP: 1104924
+    - [03dc862] mismatched image size or checksum leaves behind dangling image
+      data LP: 1122299
+    - [12d28c3] UserWarning on deprecation of legacy glance client inappropriate
+      for internal usage LP: 1129445
+    - [afe6166] 'glance-cache-manage list-cached' does not show 'last accessed'
+      and 'last modified' fields in human-readable format' LP: 1102334
+    - [ee13560] Fix broken JSON schemas in v2 tests
+
+  [ Chuck Short ]
   * debian/patches/disable-swift-tests.patch: Refreshed.
 
- -- Chuck Short <[e-mail]>  Thu, 21 Mar 2013 10:18:54 -0500
+ -- Adam Gandelman <[e-mail]>  Thu, 25 Apr 2013 17:39:57 -0400
 
 glance (2012.2.3-0ubuntu2) quantal-proposed; urgency=low