Merge lp:~gandelman-a/ubuntu/precise/glance/UCA_2012.2.1 into lp:~ubuntu-cloud-archive/ubuntu/precise/glance/folsom

[Adam Gandelman]

Syncs the lp:~ubuntu-cloud-archive branch to current state of the package in the U.C.A., and imports current SRU pending in quantal-proposed.

=== modified file '.gitreview'
--- .gitreview	2012-07-06 11:13:13 +0000
+++ .gitreview	2013-01-08 00:34:25 +0000
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/glance.git
+defaultbranch=stable/folsom

=== modified file '.pc/disable-swift-tests.patch/glance/tests/functional/v2/test_images.py'
--- .pc/disable-swift-tests.patch/glance/tests/functional/v2/test_images.py	2012-09-26 12:32:50 +0000
+++ .pc/disable-swift-tests.patch/glance/tests/functional/v2/test_images.py	2013-01-08 00:34:25 +0000
@@ -218,6 +218,12 @@
         self.assertEqual(201, response.status_code)
         image_id = json.loads(response.text)['id']
 
+        # Upload some image data
+        path = self._url('/v2/images/%s/file' % image_id)
+        headers = self._headers({'Content-Type': 'application/octet-stream'})
+        response = requests.put(path, headers=headers, data='ZZZZZ')
+        self.assertEqual(201, response.status_code)
+
         # TENANT1 should see the image in their list
         path = self._url('/v2/images')
         response = requests.get(path, headers=self._headers())
@@ -300,6 +306,12 @@
         response = requests.delete(path, headers=headers)
         self.assertEqual(404, response.status_code)
 
+        # Image data should still be present after the failed delete
+        path = self._url('/v2/images/%s/file' % image_id)
+        response = requests.get(path, headers=self._headers())
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(response.text, 'ZZZZZ')
+
         self.stop_servers()
 
     def test_tag_lifecycle(self):

=== modified file '.pc/disable-swift-tests.patch/glance/tests/unit/test_clients.py'
--- .pc/disable-swift-tests.patch/glance/tests/unit/test_clients.py	2012-09-17 07:44:11 +0000
+++ .pc/disable-swift-tests.patch/glance/tests/unit/test_clients.py	2013-01-08 00:34:25 +0000
@@ -39,7 +39,7 @@
 UUID2 = _gen_uuid()
 
 #NOTE(bcwaldon): needed to init config_dir cli opt
-config.parse_args()
+config.parse_args(args=[])
 
 
 class TestBadClients(test_utils.BaseTestCase):

=== modified file 'AUTHORS'
--- AUTHORS	2012-09-17 07:44:11 +0000
+++ AUTHORS	2013-01-08 00:34:25 +0000
@@ -28,6 +28,7 @@
 Eoghan Glynn <[e-mail]>
 Ewan Mellor <[e-mail]>
 Gabriel Hurley <[e-mail]>
+Gerardo Porras <[e-mail]>
 Hengqing Hu <[e-mail]>
 iccha <[e-mail]>
 Ionuț Arțăriși <[e-mail]>
@@ -59,6 +60,7 @@
 Lorin Hochstein <[e-mail]>
 lzyeval <[e-mail]>
 Major Hayden <[e-mail]>
+Mark J. Washenberger <[e-mail]>
 Mark J. Washenberger <[e-mail]>
 Mark McLoughlin <[e-mail]>
 Mark Washenberger <[e-mail]>
@@ -94,6 +96,7 @@
 Thierry Carrez <[e-mail]>
 Tomas Hancock <[e-mail]>
 Tom Hancock <[e-mail]>
+Unmesh Gurjar <[e-mail]>
 Unmesh Gurjar <[e-mail]>
 Vincent Untz <[e-mail]>
 Vishvananda Ishaya <[e-mail]>

=== modified file 'ChangeLog'
--- ChangeLog	2012-09-26 12:37:00 +0000
+++ ChangeLog	2013-01-08 00:34:25 +0000
@@ -1,3 +1,276 @@
+commit a4062940b804f524ada38df3c62c14b9c98f82bc
+Merge: 91aaa48 49408e9
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 27 23:16:35 2012 +0000
+
+    Merge "Ensure strings passed to librbd are not unicode" into stable/folsom
+
+commit 49408e9f846ab08ed4f1ac32c3e4e934cd448990
+Author: Josh Durgin <[e-mail]>
+Date:   Fri Nov 9 09:28:19 2012 -0800
+
+    Ensure strings passed to librbd are not unicode
+    
+    librbd rejects unicode by throwing an exception. If the location uri
+    was unicode, this would result in deletes failing. Convert all rbd
+    StoreLocation properties to ascii strings to avoid this problem.
+    
+    Fixes bug #1075580
+    Signed-off-by: Josh Durgin <[e-mail]>
+    
+    Change-Id: I445902bb1b72b8c814585f1481e6bf9e758b4e07
+    (cherry picked from commit 3aea9320d20d0291c5b4b027a585370d8e658a95)
+
+ glance/store/rbd.py                      |   12 +++++++++++-
+ glance/tests/unit/test_store_location.py |   30 ++++++++++++++++++++++++++++++
+ 2 files changed, 41 insertions(+), 1 deletion(-)
+
+commit 91aaa487d34ed57718f0183b27e79c02ac70941e
+Author: Mark J. Washenberger <[e-mail]>
+Date:   Tue Nov 20 12:41:48 2012 -0800
+
+    Make cooperative reader always support read()
+    
+    glance.common.utils.CooperativeReader provides eventlet-friendly
+    cooperation on top of backends that support either read() or __iter__().
+    However, in the case of backends that only support __iter__(), such as
+    images returned by store.get(...), read() is not defined. This patch
+    adds read() in all cases.
+    
+    Fixes bug 1057322.
+    
+    Change-Id: I67d9b3e4d93fbefd7eeaf7cfc947ab635fe09534
+
+ glance/common/utils.py          |   17 +++++++++++++++++
+ glance/tests/unit/test_utils.py |   11 +++++++++++
+ 2 files changed, 28 insertions(+)
+
+commit a296a5b3686aeb9c337b46a5a066888e6863e7a4
+Author: Unmesh Gurjar <[e-mail]>
+Date:   Tue Oct 23 03:34:31 2012 -0700
+
+    Return 403 when admin deletes a deleted image
+    
+    1. Returned a 403 Forbidden error when an admin user tries to delete a deleted
+    image.
+    2. Added unit test coverage.
+    
+    Fixes LP: #1060944
+    
+    Change-Id: I1a5c4ca18e2e70d8a614b3132bfcea1f56c5f59c
+
+ glance/api/v1/images.py          |    6 +++++
+ glance/tests/unit/v1/test_api.py |   45 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 51 insertions(+)
+
+commit a98768169c3a7ff23987b15f32333400c41f322f
+Merge: 5dac0b1 3e58a6a
+Author: Jenkins <[e-mail]>
+Date:   Mon Nov 19 19:06:53 2012 +0000
+
+    Merge "Disallow updating deleted images." into stable/folsom
+
+commit 5dac0b1933514c2e9380eed4625a2ece25f458a0
+Merge: 7336c8d 26c8085
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 14 20:31:57 2012 +0000
+
+    Merge "Return HTTP 404 for deleted images in v2" into stable/folsom
+
+commit 7336c8d0073bff0a106530dd782c567956bbe32e
+Merge: 517e059 8321ca6
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 14 20:27:56 2012 +0000
+
+    Merge "Add noseopts and replace noseargs where needed to run_test.sh" into stable/folsom
+
+commit 517e059aac38c69d03ddb040ad127b14a59adced
+Merge: fc0ee76 c3bea11
+Author: Jenkins <[e-mail]>
+Date:   Mon Nov 12 14:18:18 2012 +0000
+
+    Merge "Pull in a versioning fix from openstack-common." into stable/folsom
+
+commit fc0ee7623ec59c87ac6fc671e95a9798d6f2e2c3
+Author: Mark J. Washenberger <[e-mail]>
+Date:   Thu Nov 8 10:56:07 2012 -0800
+
+    Ensure authorization before deleting from store
+    
+    This fixes bug 1076506.
+    
+    Change-Id: I3794c14fe523a9a27e943d73dd0248489d2b91f6
+
+ glance/api/v2/images.py                   |   21 ++++++++++++---------
+ glance/tests/functional/v2/test_images.py |   12 ++++++++++++
+ 2 files changed, 24 insertions(+), 9 deletions(-)
+
+commit 90bcdc5a89e350a358cf320a03f5afe99795f6f6
+Author: Mark Washenberger <[e-mail]>
+Date:   Wed Nov 7 09:59:56 2012 -0500
+
+    Delete from store after registry delete.
+    
+    Because we rely on the registry to determine authorization in the glance
+    v1 api, we must attempt a registry delete before deleting an image from
+    the image store.
+    
+    This patch includes the test for the bug, which was posted separately
+    on the bug.
+    
+    Fixes bug 1065187.
+    
+    Change-Id: I1a06b7c7421524066c684539e2f3516c4ed2c475
+
+ glance/api/v1/images.py          |   16 +++++++++++-----
+ glance/tests/stubs.py            |    8 +++++++-
+ glance/tests/unit/v1/test_api.py |   20 ++++++++++++++++++++
+ glance/tests/utils.py            |    1 +
+ 4 files changed, 39 insertions(+), 6 deletions(-)
+
+commit 7841cc93050fa48a1fbd8847cec887f0360be9a3
+Author: Mark Washenberger <[e-mail]>
+Date:   Sun Oct 7 02:12:52 2012 +0000
+
+    FakeAuth not always admin
+    
+    The FakeAuthMiddleware was defaulting to admin=True for request
+    contexts. This creates a situation where it is impossible to test
+    non-admin requests in some situations.
+    
+    Change-Id: I949f708efed9f07a43b8506870c5b38fce4b3752
+
+ glance/tests/unit/v1/test_api.py |    3 ++-
+ glance/tests/utils.py            |    2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit c3bea11ede57c6d46b7a90f932255624f549de46
+Author: Monty Taylor <[e-mail]>
+Date:   Fri Oct 26 11:09:16 2012 -0400
+
+    Pull in a versioning fix from openstack-common.
+    
+    Fixes bug 1059634. Related to I6cff4ee7f6c1dc970397b66fd2d15fa22b0a63a3
+    
+    (Cherry-picked from 68253587f0d5a5b5f0dde63dd6036c7977e4f3d6)
+    
+    Change-Id: I4c8daa8bf4a57849bd8d1e512a388d982f79b7d5
+
+ glance/openstack/common/setup.py |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+commit 26c80856620f2ac3a662028eb3d53c3196b66a82
+Author: Mark Washenberger <[e-mail]>
+Date:   Thu Oct 25 19:46:10 2012 +0000
+
+    Return HTTP 404 for deleted images in v2
+    
+    For admin contexts, the db api will return deleted images. This patch
+    manually checks for deleted images in the v2 controller code to treat
+    these cases as if the images didn't exist.
+    
+    Fixes bug 1071446
+    
+    Change-Id: I33075f94e9d560a279085e2afd18c8052f57d60b
+
+ glance/api/v2/images.py                      |    7 +++++-
+ glance/tests/unit/v2/test_images_resource.py |   32 ++++++++++++++++++++++++++
+ 2 files changed, 38 insertions(+), 1 deletion(-)
+
+commit 3e58a6a6658f0e9a1e1f167f8b9cec4e9f32b3e4
+Author: Unmesh Gurjar <[e-mail]>
+Date:   Mon Oct 22 07:38:33 2012 -0700
+
+    Disallow updating deleted images.
+    
+    1. Return a 403 Forbidden error when an admin user tries to update a deleted
+    image.
+    2. Also added unit test coverage.
+    
+    Fixes LP: #1060930
+    
+    Change-Id: I8290c8c9f1bcbbfbff7d54f141bdcfa1c40aab6f
+
+ glance/api/v1/images.py          |    8 ++++++++
+ glance/tests/unit/v1/test_api.py |   17 +++++++++++++++++
+ 2 files changed, 25 insertions(+)
+
+commit ddad2752b3afb480f5be1352cd2ef56739d3cdad
+Author: Sean Dague <[e-mail]>
+Date:   Wed Oct 31 11:38:47 2012 -0400
+
+    pin sqlalchemy to the 0.7.x series
+    
+    sqlalchemy 0.8beta is now out and has internal changes
+    which mean it's not an in place seemless upgrade. This pins
+    sqlalchemy to the 0.7.x series to avoid those breaks.
+    
+    Fixes bug #1073569
+    
+    Change-Id: Ia8976843a7e0a132fe38e80f2bcb01a16e12b8de
+
+ tools/pip-requires |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 8321ca6ff4d2ab15bece70d7ff84f2e3dd3f6896
+Author: Gerardo Porras <[e-mail]>
+Date:   Wed Oct 17 16:00:48 2012 -0700
+
+    Add noseopts and replace noseargs where needed to run_test.sh
+    
+    Add of noseopts to the run_tests script so users can be
+    able to run tests adding extra options to be passed to
+    nosetests.
+    This option is currently in keystone but not in glance.
+    Fixes bug 1065758
+    
+    Change-Id: I7c78749adb90b126da5bd9580da6bfd7c9e1bf54
+
+ run_tests.sh |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+commit 1d5c651321a87e218995821b0d148867db977988
+Author: Mark Washenberger <[e-mail]>
+Date:   Tue Sep 25 19:57:10 2012 +0000
+
+    Pass empty args to test config parser.
+    
+    This fixes bug 1056420, which allows users to pass nosetests options
+    through run_tests.sh again.
+    
+    Change-Id: I03e84488a24e2552b61aa0cab842d8325e8e856f
+    (cherry picked from commit ef641597dbfc0fcb856c143b213be493ab44cc65)
+
+ glance/tests/unit/test_clients.py |    2 +-
+ glance/tests/utils.py             |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ac223e243736ba98a0ec480d3f80e39a555d3343
+Author: Mark McLoughlin <[e-mail]>
+Date:   Sat Oct 13 22:44:12 2012 +0100
+
+    Set defaultbranch in .gitreview to stable/folsom
+    
+    This allows people run git-review without any arguments.
+    
+    Change-Id: I2b2488ffffd783b64e5c760324e7d4a00d5a39db
+
+ .gitreview |    1 +
+ 1 file changed, 1 insertion(+)
+
+commit 6740af2f8186aa903c45afa2c2329564fce90fdf
+Author: Thierry Carrez <[e-mail]>
+Date:   Fri Sep 28 16:14:02 2012 +0200
+
+    Bump next version to 2012.2.1
+    
+    Open stable/folsom by bumping next version to 2012.2.1.
+    
+    Change-Id: Ia452eaf82c873a6b19f155f21a79116d32530b5b
+
+ glance/version.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 commit a9f0a4c4dbac0c92c431150161915bd5459a42d0
 Author: Eoghan Glynn <[e-mail]>
 Date:   Tue Sep 25 22:13:56 2012 +0100
@@ -1273,7 +1546,7 @@
     
     Change-Id: I6dc2afa735fb2f82df71d58b10c1e1530fce2f89
 
- .../versions/014_add_image_tags_table.py           |    5 +++++
+ .../sqlalchemy/migrate_repo/versions/014_add_image_tags_table.py  |    5 +++++
  1 file changed, 5 insertions(+)
 
 commit 80c099e0b41b3f2f9684b06f1f4eee8e2776969e
@@ -4074,48 +4347,48 @@
     
     Change-Id: Ia1a7b5062e7f882971f2061274f6a4a44cfc8ced
 
- glance/api/middleware/cache.py                     |    2 +-
- glance/api/middleware/cache_manage.py              |    3 +--
- glance/api/middleware/context.py                   |    3 ++-
- glance/api/middleware/version_negotiation.py       |    3 +--
- glance/api/policy.py                               |    2 +-
- glance/api/v1/controller.py                        |    3 +--
- glance/api/v1/images.py                            |    2 +-
- glance/api/v1/members.py                           |    3 +--
- glance/api/v2/images.py                            |    2 +-
- glance/common/auth.py                              |    2 +-
- glance/common/client.py                            |    2 +-
- glance/common/utils.py                             |    2 +-
- glance/common/wsgi.py                              |    3 ++-
- glance/db/simple/api.py                            |    2 +-
- glance/db/sqlalchemy/api.py                        |    3 ++-
- glance/db/sqlalchemy/migrate_repo/schema.py        |    4 ++--
- .../versions/015_quote_swift_credentials.py        |    2 +-
- glance/db/sqlalchemy/migration.py                  |    2 +-
- glance/image_cache/__init__.py                     |    3 +--
- glance/image_cache/drivers/base.py                 |    2 +-
- glance/image_cache/drivers/sqlite.py               |    2 +-
- glance/image_cache/drivers/xattr.py                |    2 +-
- glance/image_cache/prefetcher.py                   |    3 +--
- glance/notifier/__init__.py                        |    2 +-
- glance/notifier/notify_kombu.py                    |    2 +-
- glance/notifier/notify_log.py                      |    4 +---
- glance/notifier/notify_qpid.py                     |    2 +-
- glance/registry/__init__.py                        |    2 +-
- glance/registry/api/v1/images.py                   |    3 +--
- glance/registry/api/v1/members.py                  |    3 +--
- glance/store/__init__.py                           |    2 +-
- glance/store/base.py                               |    3 +--
- glance/store/filesystem.py                         |    2 +-
- glance/store/http.py                               |    2 +-
- glance/store/location.py                           |    2 +-
- glance/store/rbd.py                                |    2 +-
- glance/store/s3.py                                 |    2 +-
- glance/store/scrubber.py                           |    2 +-
- glance/store/swift.py                              |    2 +-
- glance/tests/unit/test_notifier.py                 |    3 +--
- glance/tests/unit/utils.py                         |    3 +--
- tools/migrate_image_owners.py                      |    2 +-
+ glance/api/middleware/cache.py                                     |    2 +-
+ glance/api/middleware/cache_manage.py                              |    3 +--
+ glance/api/middleware/context.py                                   |    3 ++-
+ glance/api/middleware/version_negotiation.py                       |    3 +--
+ glance/api/policy.py                                               |    2 +-
+ glance/api/v1/controller.py                                        |    3 +--
+ glance/api/v1/images.py                                            |    2 +-
+ glance/api/v1/members.py                                           |    3 +--
+ glance/api/v2/images.py                                            |    2 +-
+ glance/common/auth.py                                              |    2 +-
+ glance/common/client.py                                            |    2 +-
+ glance/common/utils.py                                             |    2 +-
+ glance/common/wsgi.py                                              |    3 ++-
+ glance/db/simple/api.py                                            |    2 +-
+ glance/db/sqlalchemy/api.py                                        |    3 ++-
+ glance/db/sqlalchemy/migrate_repo/schema.py                        |    4 ++--
+ .../migrate_repo/versions/015_quote_swift_credentials.py           |    2 +-
+ glance/db/sqlalchemy/migration.py                                  |    2 +-
+ glance/image_cache/__init__.py                                     |    3 +--
+ glance/image_cache/drivers/base.py                                 |    2 +-
+ glance/image_cache/drivers/sqlite.py                               |    2 +-
+ glance/image_cache/drivers/xattr.py                                |    2 +-
+ glance/image_cache/prefetcher.py                                   |    3 +--
+ glance/notifier/__init__.py                                        |    2 +-
+ glance/notifier/notify_kombu.py                                    |    2 +-
+ glance/notifier/notify_log.py                                      |    4 +---
+ glance/notifier/notify_qpid.py                                     |    2 +-
+ glance/registry/__init__.py                                        |    2 +-
+ glance/registry/api/v1/images.py                                   |    3 +--
+ glance/registry/api/v1/members.py                                  |    3 +--
+ glance/store/__init__.py                                           |    2 +-
+ glance/store/base.py                                               |    3 +--
+ glance/store/filesystem.py                                         |    2 +-
+ glance/store/http.py                                               |    2 +-
+ glance/store/location.py                                           |    2 +-
+ glance/store/rbd.py                                                |    2 +-
+ glance/store/s3.py                                                 |    2 +-
+ glance/store/scrubber.py                                           |    2 +-
+ glance/store/swift.py                                              |    2 +-
+ glance/tests/unit/test_notifier.py                                 |    3 +--
+ glance/tests/unit/utils.py                                         |    3 +--
+ tools/migrate_image_owners.py                                      |    2 +-
  42 files changed, 46 insertions(+), 56 deletions(-)
 
 commit 69d3cd58b755ac6c50b1aef31131819c911e41f6
@@ -5342,13 +5615,13 @@
     
     Change-Id: I10c677cfd5186edce3ca96495eafc732168cac86
 
- .../migrate_repo/versions/003_add_disk_format.py   |    1 -
- .../migrate_repo/versions/004_add_checksum.py      |    1 -
- .../migrate_repo/versions/006_key_to_name.py       |    1 -
- .../migrate_repo/versions/007_add_owner.py         |    1 -
- .../versions/008_add_image_members_table.py        |    4 ++--
- .../versions/009_add_mindisk_and_minram.py         |    1 -
- .../migrate_repo/versions/012_id_to_uuid.py        |    1 -
+ glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py  |    1 -
+ glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py     |    1 -
+ glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py      |    1 -
+ glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py        |    1 -
+ .../migrate_repo/versions/008_add_image_members_table.py           |    4 ++--
+ .../sqlalchemy/migrate_repo/versions/009_add_mindisk_and_minram.py |    1 -
+ glance/db/sqlalchemy/migrate_repo/versions/012_id_to_uuid.py       |    1 -
  7 files changed, 2 insertions(+), 8 deletions(-)
 
 commit 9c8c630d53877c5a9b0dda856b207468fdb4062c
@@ -5472,13 +5745,13 @@
     
     Change-Id: I3c4d98c81dee6676916c60e71a749037ae1edc81
 
- glance/common/exception.py                         |    2 +-
- .../versions/015_quote_swift_credentials.py        |   15 +++++++++++----
- glance/store/filesystem.py                         |    5 +++--
- glance/store/http.py                               |    9 +++++++--
- glance/store/rbd.py                                |    5 +++--
- glance/store/s3.py                                 |   13 ++++++++-----
- glance/store/swift.py                              |   14 +++++++++-----
+ glance/common/exception.py                              |    2 +-
+ .../versions/015_quote_swift_credentials.py             |   15 +++++++++++----
+ glance/store/filesystem.py                              |    5 +++--
+ glance/store/http.py                                    |    9 +++++++--
+ glance/store/rbd.py                                     |    5 +++--
+ glance/store/s3.py                                      |   13 ++++++++-----
+ glance/store/swift.py                                   |   14 +++++++++-----
  7 files changed, 42 insertions(+), 21 deletions(-)
 
 commit b3b4d64ae23fd3a662e6ebc98642c42fe6631cad
@@ -5502,13 +5775,13 @@
     
     Change-Id: I68c6f1735e5001641994ed4f84ad879397ba8713
 
- glance/tests/functional/store_utils.py             |    3 ++-
- glance/tests/functional/test_bin_glance.py         |   10 +++++++---
- .../tests/functional/v1/test_cache_middleware.py   |    4 +++-
- glance/tests/functional/v1/test_copy_to_file.py    |    4 +++-
- glance/tests/functional/v1/test_s3.py              |    4 +++-
- glance/tests/functional/v1/test_swift.py           |    4 +++-
- glance/tests/utils.py                              |    5 +++--
+ glance/tests/functional/store_utils.py              |    3 ++-
+ glance/tests/functional/test_bin_glance.py          |   10 +++++++---
+ glance/tests/functional/v1/test_cache_middleware.py |    4 +++-
+ glance/tests/functional/v1/test_copy_to_file.py     |    4 +++-
+ glance/tests/functional/v1/test_s3.py               |    4 +++-
+ glance/tests/functional/v1/test_swift.py            |    4 +++-
+ glance/tests/utils.py                               |    5 +++--
  7 files changed, 24 insertions(+), 10 deletions(-)
 
 commit c44e16a538113293c7e73eea22c2ebc0f84c365f
@@ -8228,9 +8501,9 @@
     
     Change-Id: Ie4f4c13846de727647abe168aeb193a93f03e0bf
 
- glance/tests/functional/test_bin_glance.py         |    1 +
- .../functional/v1/test_bin_glance_cache_manage.py  |    1 +
- glance/tests/functional/v1/test_misc.py            |   10 ++++++++++
+ glance/tests/functional/test_bin_glance.py                 |    1 +
+ glance/tests/functional/v1/test_bin_glance_cache_manage.py |    1 +
+ glance/tests/functional/v1/test_misc.py                    |   10 ++++++++++
  3 files changed, 12 insertions(+)
 
 commit ca84ec7d5550c0978ac80fad7972e77c1c971107
@@ -8562,21 +8835,21 @@
     
     Change-Id: I9d602ed429caff8ffb00e40f623c473c5425e1cc
 
- glance/tests/functional/test_logging.py            |    2 --
- glance/tests/functional/test_respawn.py            |    2 +-
- glance/tests/functional/test_scrubber.py           |    3 ---
- .../functional/v1/test_bin_glance_cache_manage.py  |    4 ----
- .../tests/functional/v1/test_cache_middleware.py   |    1 -
- glance/tests/functional/v1/test_s3.py              |    5 +----
- glance/tests/functional/v1/test_ssl.py             |    6 +-----
- glance/tests/functional/v1/test_swift.py           |    1 -
- glance/tests/stubs.py                              |    2 --
- glance/tests/unit/test_clients.py                  |    8 --------
- glance/tests/unit/test_context.py                  |    2 --
- glance/tests/unit/test_db.py                       |    1 -
- glance/tests/unit/test_filesystem_store.py         |    3 ---
- glance/tests/unit/test_image_cache.py              |    1 -
- glance/tests/unit/test_s3_store.py                 |    5 +----
+ glance/tests/functional/test_logging.py                    |    2 --
+ glance/tests/functional/test_respawn.py                    |    2 +-
+ glance/tests/functional/test_scrubber.py                   |    3 ---
+ glance/tests/functional/v1/test_bin_glance_cache_manage.py |    4 ----
+ glance/tests/functional/v1/test_cache_middleware.py        |    1 -
+ glance/tests/functional/v1/test_s3.py                      |    5 +----
+ glance/tests/functional/v1/test_ssl.py                     |    6 +-----
+ glance/tests/functional/v1/test_swift.py                   |    1 -
+ glance/tests/stubs.py                                      |    2 --
+ glance/tests/unit/test_clients.py                          |    8 --------
+ glance/tests/unit/test_context.py                          |    2 --
+ glance/tests/unit/test_db.py                               |    1 -
+ glance/tests/unit/test_filesystem_store.py                 |    3 ---
+ glance/tests/unit/test_image_cache.py                      |    1 -
+ glance/tests/unit/test_s3_store.py                         |    5 +----
  15 files changed, 4 insertions(+), 42 deletions(-)
 
 commit 35ed3105552cf6c182c76b6f13f719bfe7eb596b
@@ -8707,8 +8980,8 @@
     
     Change-Id: Iab80a65464a591b732ecce4c00d04df50624e912
 
- Authors                                            |    1 +
- .../db/migrate_repo/versions/006_key_to_name.py    |    2 +-
+ Authors                                                     |    1 +
+ glance/registry/db/migrate_repo/versions/006_key_to_name.py |    2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 257be28b8c77bd1fa3e402d2bd2f5ee67ac4e60e
@@ -10302,12 +10575,12 @@
     Change-Id: I5ad5042dbc9785829694553f2657df3eb6e3ef20
     Signed-off-by: Chuck Short <[e-mail]>
 
- .../migrate_repo/versions/001_add_images_table.py  |    2 +-
- .../versions/002_add_image_properties_table.py     |    2 +-
- .../db/migrate_repo/versions/004_add_checksum.py   |    2 +-
- .../db/migrate_repo/versions/007_add_owner.py      |    2 +-
- .../versions/008_add_image_members_table.py        |    2 +-
- .../versions/009_add_mindisk_and_minram.py         |    2 +-
+ glance/registry/db/migrate_repo/versions/001_add_images_table.py     |    2 +-
+ .../db/migrate_repo/versions/002_add_image_properties_table.py       |    2 +-
+ glance/registry/db/migrate_repo/versions/004_add_checksum.py         |    2 +-
+ glance/registry/db/migrate_repo/versions/007_add_owner.py            |    2 +-
+ .../registry/db/migrate_repo/versions/008_add_image_members_table.py |    2 +-
+ .../registry/db/migrate_repo/versions/009_add_mindisk_and_minram.py  |    2 +-
  6 files changed, 6 insertions(+), 6 deletions(-)
 
 commit 3b229c394521e5b1b81e4629c6ff9c09e3b866c9
@@ -10991,8 +11264,8 @@
     
     Change-Id: Ic248fdfe3933437928f0b393d8cde993b96bf2cb
 
- .mailmap                                           |    1 +
- .../migrate_repo/versions/003_add_disk_format.py   |    2 +-
+ .mailmap                                                        |    1 +
+ glance/registry/db/migrate_repo/versions/003_add_disk_format.py |    2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 59ca8b0b44bbb2276d7e5903bfe9d14a6a26d901
@@ -11352,7 +11625,7 @@
     
     Change-Id: Iab1c3e7a52d739a445cf52eb9a67f61a69075026
 
- .../db/migrate_repo/versions/012_id_to_uuid.py     |    8 ++------
+ glance/registry/db/migrate_repo/versions/012_id_to_uuid.py |    8 ++------
  1 file changed, 2 insertions(+), 6 deletions(-)
 
 commit 300d4031a94b85539a30bde726131231008c80a6
@@ -13740,7 +14013,7 @@
     
     Change-Id: I66307cb355120b992913c8a1d8d5855b30f70504
 
- .../db/migrate_repo/versions/012_id_to_uuid.py     |    4 ++--
+ glance/registry/db/migrate_repo/versions/012_id_to_uuid.py |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 94dcf3acd0b3ef7adcb61b90bf4bdcc733cf61ac
@@ -21103,8 +21376,8 @@
 
     Add migration scripts for revising the datatype of the 'size' column in the images table.
 
- .../migrate_repo/versions/006_mysql_downgrade.sql  |    2 ++
- .../db/migrate_repo/versions/006_mysql_upgrade.sql |    2 ++
+ glance/registry/db/migrate_repo/versions/006_mysql_downgrade.sql |    2 ++
+ glance/registry/db/migrate_repo/versions/006_mysql_upgrade.sql   |    2 ++
  2 files changed, 4 insertions(+)
 
 commit 84051230f523294a1ea57bcdb3560bcdb4fda84e
@@ -23083,8 +23356,8 @@
 
     Creating indexes
 
- .../migrate_repo/versions/001_add_images_table.py  |    9 +++++----
- .../versions/002_add_image_properties_table.py     |   14 +++++++++-----
+ .../db/migrate_repo/versions/001_add_images_table.py     |    9 +++++----
+ .../versions/002_add_image_properties_table.py           |   14 +++++++++-----
  2 files changed, 14 insertions(+), 9 deletions(-)
 
 commit d060da4993312aa803371464d876a63ded7afba3
@@ -23114,8 +23387,8 @@
 
     Small cleanups
 
- .../migrate_repo/versions/001_add_images_table.py  |   12 +++---------
- .../versions/002_add_image_properties_table.py     |   12 +++---------
+ .../db/migrate_repo/versions/001_add_images_table.py       |   12 +++---------
+ .../versions/002_add_image_properties_table.py             |   12 +++---------
  2 files changed, 6 insertions(+), 18 deletions(-)
 
 commit a436b433ca746864aed9fdec8bbe345c3bf147a7
@@ -23220,9 +23493,9 @@
 
     Better logging
 
- glance/registry/db/migrate_repo/schema.py          |   19 +++++++++++++++++++
- .../migrate_repo/versions/001_add_images_table.py  |   12 ++++++------
- .../versions/002_add_image_properties_table.py     |   13 ++++++-------
+ glance/registry/db/migrate_repo/schema.py           |   19 +++++++++++++++++++
+ .../migrate_repo/versions/001_add_images_table.py   |   12 ++++++------
+ .../versions/002_add_image_properties_table.py      |   13 ++++++-------
  3 files changed, 31 insertions(+), 13 deletions(-)
 
 commit d923a0417537552f672fd5b38b63f40c695f5cd5

=== modified file 'PKG-INFO'
--- PKG-INFO	2012-06-22 09:18:07 +0000
+++ PKG-INFO	2013-01-08 00:34:25 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: glance
-Version: 2012.2
+Version: 2012.2.1
 Summary: The Glance project provides services for discovering, registering, and retrieving virtual machine images
 Home-page: http://glance.openstack.org/
 Author: OpenStack

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-19 23:02:14 +0000
+++ debian/changelog	2013-01-08 00:34:25 +0000
@@ -1,8 +1,66 @@
-glance (2012.2-0ubuntu2~cloud0) precise-folsom; urgency=low
-
-  * New release candidate for the Ubuntu Cloud Archive.
-
- -- Adam Gandelman <[e-mail]>  Fri, 19 Oct 2012 23:02:14 -0700
+glance (2012.2.1-0ubuntu1~cloud0) precise-folsom; urgency=low
+
+  * Stable update for the Ubuntu Cloud Archive.
+
+ -- Adam Gandelman <[e-mail]>  Mon, 07 Jan 2013 16:02:15 -0800
+
+glance (2012.2.1-0ubuntu1) quantal-proposed; urgency=low
+
+  * Dropped patches, applied upstream:
+    - debian/patches/CVE-2012-4573.patch
+    - debian/patches/CVE-2012-4573b.patch
+  * Resynchronize with stable/folsom (199783ce) (LP: #1085255):
+    - [49408e9] Glance image-delete HTTPInternalServerError HTTP 500 
+      (LP: #1075580)
+    - [91aaa48] Image fails to upload to swift: TypeError: object of type
+      'CooperativeReader' has no len( (LP: #1057322)
+    - [a296a5b] Return 403 when admin deletes a deleted image (LP: #1060944)
+    - [3e58a6a] Disallow updating deleted images. (LP: #1060930)
+    - [26c8085] admins can see deleted images in v2 api (LP: #1071446)
+    - [8321ca6] No exclude option to skip tests in run_tests.sh (LP: #1065758)
+    - [c3bea11] Badly named stable/folsom Glance tarballs (LP: #1059634)
+    - [fc0ee76] Non-admin users can cause public glance images to be deleted
+      from the backend storage repository in the v2 api (LP: #1076506)
+    - [90bcdc5] Non-admin users can cause public glance images to be deleted
+      from the backend storage repository (LP: #1065187)
+    - [7841cc9] FakeAuth not always admin
+    - [ddad275] Jenkins jobs fail because of incompatibility between sqlalchemy-
+      migrate and the newest sqlalchemy-0.8.0b1 (LP: #1073569)
+    - [1d5c651] nosetest options cause no such option errors (LP: #1056420)
+    - [ac223e2] Set defaultbranch in .gitreview to stable/folsom
+
+ -- Adam Gandelman <[e-mail]>  Tue, 04 Dec 2012 09:19:35 -0800
+
+glance (2012.2-0ubuntu2.3~cloud0) precise-folsom; urgency=low
+
+  * New package update for the Ubuntu Cloud Archive.
+
+ -- Chuck Short <[e-mail]>  Wed, 21 Nov 2012 15:04:26 -0500
+
+glance (2012.2-0ubuntu2.3) quantal-security; urgency=low
+
+  * SECURITY UPDATE: deletion of arbitrary public and shared images via
+    authenticated user
+    - debian/patches/CVE-2012-4573b.patch: previous patch was incomplete.
+      Make corresponding change to glance/api/v2/images.py
+    - CVE-2012-4573
+  * debian/control: add Build-Depends-Indep on python-chardet. This is needed
+    by python-requests to do encoding detection which otherwise fails in the
+    new tests introduced in CVE-2012-4573b.patch.
+
+ -- Jamie Strandboge <[e-mail]>  Fri, 09 Nov 2012 06:53:44 -0600
+
+glance (2012.2-0ubuntu2.2) quantal-security; urgency=low
+
+  * SECURITY UPDATE: deletion of arbitrary public and shared images via
+    authenticated user
+    - debian/patches/CVE-2012-4573.patch: adjust glance/api/v1/images.py to
+      ensure image is owned by user before delayed_deletion
+    - CVE-2012-4573
+  * debian/patches/fakeauth-not-always-admin.patch: add required testsuite
+    patch in support of the testsuite changes in CVE-2012-4573.patch
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 08 Nov 2012 07:41:02 -0600
 
 glance (2012.2-0ubuntu2) quantal-proposed; urgency=low
 
@@ -11,12 +69,6 @@
 
  -- James Page <[e-mail]>  Fri, 12 Oct 2012 15:43:54 +0100
 
-glance (2012.2-0ubuntu1~cloud0) precise-folsom; urgency=low
-
-  * New release candidate for the Ubuntu Cloud Archive. 
-
- -- Chuck Short <[e-mail]>  Thu, 27 Sep 2012 15:34:04 -0500
-
 glance (2012.2-0ubuntu1) quantal; urgency=low
 
   * debian/control: Clean-up python depends. Thanks to Sam Morrison.
@@ -31,12 +83,6 @@
 
  -- Chuck Short <[e-mail]>  Wed, 26 Sep 2012 12:37:00 -0500
 
-glance (2012.2~rc2-0ubuntu1~cloud0) precise-folsom; urgency=low
-
-  * New release candidate for the Ubuntu Cloud Archive. 
-
- -- Chuck Short <[e-mail]>  Thu, 27 Sep 2012 14:04:18 -0500
-
 glance (2012.2~rc2-0ubuntu1) quantal; urgency=low
 
   * debian/control: Suggest ceph-common.
@@ -46,14 +92,16 @@
 
  -- Chuck Short <[e-mail]>  Wed, 26 Sep 2012 12:32:50 -0500
 
-glance (2012.2~rc1-0ubuntu1~cloud0) precise-folsom; urgency=low
-
-  * New release candidate for the Ubuntu Cloud Archive.
-
- -- Chuck Short <[e-mail]>  Tue, 18 Sep 2012 08:26:19 -0500
-
 glance (2012.2~rc1-0ubuntu1) quantal; urgency=low
 
+  * New upstrem release.
+  * debian/glance.logrotate: compress right logfiles when rotating them.
+    (LP: #1049314) 
+
+ -- Chuck Short <[e-mail]>  Mon, 17 Sep 2012 07:44:11 -0500
+
+glance (2012.2~rc1~20120907.129.f0bd856-0ubuntu1) quantal; urgency=low
+
   [ Chuck Short ]
   * New upstream version.
   * drop debian/patches/fix-docs-build.patch. 
@@ -61,8 +109,6 @@
   * debain/control: Add depends on python-swiftclient.
   * debian/*.usptart: make glance start from runlevel 1 to runlevel
     2. (LP: #820688)
-  * debian/glance.logrotate: compress right logfiles when rotating them.
-    (LP: #1049314) 
 
   [ Soren Hansen ]
   * Update debian/watch to account for symbolically named tarballs and
@@ -71,7 +117,7 @@
   * Refresh disable-network-for-docs.patch
   * Fix Launchpad URLs in debian/watch.
 
- -- Chuck Short <[e-mail]>  Mon, 17 Sep 2012 07:44:11 -0500
+ -- Chuck Short <[e-mail]>  Fri, 07 Sep 2012 12:17:46 -0500
 
 glance (2012.2~f3-0ubuntu1) quantal; urgency=low
 
@@ -90,10 +136,16 @@
 
  -- Chuck Short <[e-mail]>  Thu, 16 Aug 2012 13:58:32 -0500
 
-glance (2012.2~f2-0ubuntu1~cloud0) precise; urgency=low
+glance (2012.2~f2-0ubuntu1) quantal; urgency=low
+
+  * New upstream version.
+
+ -- Chuck Short <[e-mail]>  Fri, 06 Jul 2012 11:13:13 -0400
+
+glance (2012.2~f2~20120621.1644-0ubuntu1) quantal; urgency=low
 
   [ Chuck Short ]
-  * New upstream version.
+  * New upstream release.
   * debian/glance-reigstry.logrotate: Rotate the right logfile. (LP: #1009996)
   * debian/control: Fix short description of glance-client. (LP: #982658)
   * debian/pydist-overrides: Add argparse and python_swiftclient.
@@ -102,14 +154,25 @@
   * debian/glance-api.install: Remove glance-{scrubber, cache}-paste.ini.
   * debian/patches/ensure_versioned_db_models.patch: Disable while database
     related code changes settle upstream.
+
+ -- Chuck Short <[e-mail]>  Fri, 22 Jun 2012 09:18:07 -0400
+
+glance (2012.2~f2~20120531.1560-0ubuntu2) quantal; urgency=low
+
   * debian/patches/ensure_versioned_db_models.patch: Refresh.
   * debian/patches/disable-swift-tests.patch: Refresh.
   * debian/control: Re-enable python-jsonchema Dependency now that it has
     landed in main.
 
- -- Chuck Short <[e-mail]>  Tue, 17 Jul 2012 10:12:05 -0500
-
-glance (2012.2~f1-0ubuntu1~cloud0) precise-folsom; urgency=low
+ -- Adam Gandelman <[e-mail]>  Tue, 05 Jun 2012 10:53:30 -0700
+
+glance (2012.2~f2~20120531.1560-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+
+ -- Chuck Short <[e-mail]>  Fri, 01 Jun 2012 10:56:09 -0400
+
+glance (2012.2~f2~20120524.1541-0ubuntu1) quantal; urgency=low
 
   [ Adam Gandelman ]
   * debian/patches/ensure_versioned_db_models.patch: Check for valid
@@ -137,34 +200,6 @@
 
  -- Adam Gandelman <[e-mail]>  Thu, 24 May 2012 10:26:57 -0700
 
-glance (2012.2~f1-0ubuntu1~cloud0) precise; urgency=low
-
-  [ Adam Gandelman ]
-  * debian/patches/ensure_versioned_db_models.patch: Check for valid
-    db models+schema at service start, and ensure db is version controlled
-    before running all migrations.
-  * debian/{control, pydist-overrides}: *Temporarily* disable non-main
-    dependencies pending MIRs
-  * debian/rules: *Temporarily* disable tests until new dependencies are
-    satisfied
-
-  [ Chuck Short ] 
-  * New upstream version.
-  * Prepare for quantal:
-    - Removed debian/patches/fix_migration_012_foreign_keys.patch
-    - Removed debian/patches/disable_db_table_auto_create.patch
-    - Removed debian/patches/convert_properties_to_uuid.patch
-  * debian/control: Add dependency on python-requests
-  * debian/control: Add dependency on python-jsonschema
-  * debian/control: Add python-keystone as a depends. (LP: #901881)
-  * debian/patches/disable-swift-tests.patch: Rediffed
-
-  [ Paul Belanger ]
-  * debian/glance-common.postinst
-    - Give glance group read permission to /etc/glance (LP: #989205)
-
- -- Chuck Short <[e-mail]>  Mon, 09 Jul 2012 13:57:57 -0400
-
 glance (2012.1-0ubuntu2) precise; urgency=low
 
   [ Adam Gandelman ]

=== modified file 'debian/control'
--- debian/control	2012-10-12 15:43:54 +0000
+++ debian/control	2013-01-08 00:34:25 +0000
@@ -33,7 +33,8 @@
  python-glanceclient,
  python-xattr,
  curl,
- pep8
+ pep8,
+ python-chardet
 Standards-Version: 3.9.3
 XS-Python-Version: >= 2.6
 Homepage: http://launchpad.net/glance

=== modified file 'debian/patches/sql_conn.patch'
--- debian/patches/sql_conn.patch	2012-10-19 23:02:14 +0000
+++ debian/patches/sql_conn.patch	2013-01-08 00:34:25 +0000
@@ -1,8 +1,8 @@
-Index: glance-2012.2.1/etc/glance-api.conf
+Index: glance/etc/glance-api.conf
 ===================================================================
---- glance-2012.2.1.orig/etc/glance-api.conf	2012-10-19 12:22:20.857638821 -0700
-+++ glance-2012.2.1/etc/glance-api.conf	2012-10-19 12:40:12.729599445 -0700
-@@ -46,7 +46,7 @@
+--- glance.orig/etc/glance-api.conf	2012-07-24 20:49:24.649816988 -0700
++++ glance/etc/glance-api.conf	2012-07-24 20:52:03.309810007 -0700
+@@ -35,7 +35,7 @@
  # SQLAlchemy connection string for the reference implementation
  # registry server. Any valid SQLAlchemy connection string is fine.
  # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
@@ -11,11 +11,11 @@
  
  # Period in seconds after which SQLAlchemy should reestablish its connection
  # to the database.
-Index: glance-2012.2.1/etc/glance-registry.conf
+Index: glance/etc/glance-registry.conf
 ===================================================================
---- glance-2012.2.1.orig/etc/glance-registry.conf	2012-10-19 12:22:20.857638821 -0700
-+++ glance-2012.2.1/etc/glance-registry.conf	2012-10-19 12:40:12.733599445 -0700
-@@ -25,7 +25,7 @@
+--- glance.orig/etc/glance-registry.conf	2012-07-24 20:51:10.497812331 -0700
++++ glance/etc/glance-registry.conf	2012-07-24 20:51:11.301812296 -0700
+@@ -21,7 +21,7 @@
  # SQLAlchemy connection string for the reference implementation
  # registry server. Any valid SQLAlchemy connection string is fine.
  # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine

=== modified file 'glance.egg-info/PKG-INFO'
--- glance.egg-info/PKG-INFO	2012-06-22 09:18:07 +0000
+++ glance.egg-info/PKG-INFO	2013-01-08 00:34:25 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: glance
-Version: 2012.2
+Version: 2012.2.1
 Summary: The Glance project provides services for discovering, registering, and retrieving virtual machine images
 Home-page: http://glance.openstack.org/
 Author: OpenStack

=== modified file 'glance.egg-info/requires.txt'
--- glance.egg-info/requires.txt	2012-09-17 07:44:11 +0000
+++ glance.egg-info/requires.txt	2013-01-08 00:34:25 +0000
@@ -1,5 +1,5 @@
 greenlet>=0.3.1
-SQLAlchemy>=0.7
+SQLAlchemy>=0.7,<=0.7.9
 anyjson
 eventlet>=0.9.12
 PasteDeploy

=== modified file 'glance/api/v1/images.py'
--- glance/api/v1/images.py	2012-09-17 07:44:11 +0000
+++ glance/api/v1/images.py	2013-01-08 00:34:25 +0000
@@ -714,6 +714,14 @@
         orig_image_meta = self.get_image_meta_or_404(req, id)
         orig_status = orig_image_meta['status']
 
+        # Do not allow any updates on a deleted image.
+        # Fix for LP Bug #1060930
+        if orig_status == 'deleted':
+            msg = _("Forbidden to update deleted image.")
+            raise HTTPForbidden(explanation=msg,
+                                request=req,
+                                content_type="text/plain")
+
         # The default behaviour for a PUT /images/<IMAGE_ID> is to
         # override any properties that were previously set. This, however,
         # leads to a number of issues for the common use case where a caller
@@ -821,22 +829,34 @@
                                 request=req,
                                 content_type="text/plain")
 
-        status = 'deleted'
+        if image['status'] == 'deleted':
+            msg = _("Forbidden to delete a deleted image.")
+            LOG.debug(msg)
+            raise HTTPForbidden(explanation=msg, request=req,
+                                content_type="text/plain")
+
+        if image['location'] and CONF.delayed_delete:
+            status = 'pending_delete'
+        else:
+            status = 'deleted'
+
         try:
+            # Delete the image from the registry first, since we rely on it
+            # for authorization checks.
+            # See https://bugs.launchpad.net/glance/+bug/1065187
+            registry.update_image_metadata(req.context, id, {'status': status})
+            registry.delete_image_metadata(req.context, id)
+
             # The image's location field may be None in the case
             # of a saving or queued image, therefore don't ask a backend
             # to delete the image if the backend doesn't yet store it.
             # See https://bugs.launchpad.net/glance/+bug/747799
             if image['location']:
                 if CONF.delayed_delete:
-                    status = 'pending_delete'
                     schedule_delayed_delete_from_backend(image['location'], id)
                 else:
                     safe_delete_from_backend(image['location'],
                                              req.context, id)
-
-            registry.update_image_metadata(req.context, id, {'status': status})
-            registry.delete_image_metadata(req.context, id)
         except exception.NotFound, e:
             msg = ("Failed to find image to delete: %(e)s" % locals())
             for line in msg.split('\n'):

=== modified file 'glance/api/v2/images.py'
--- glance/api/v2/images.py	2012-09-17 07:44:11 +0000
+++ glance/api/v2/images.py	2013-01-08 00:34:25 +0000
@@ -142,9 +142,12 @@
 
     def _get_image(self, context, image_id):
         try:
-            return self.db_api.image_get(context, image_id)
+            image = self.db_api.image_get(context, image_id)
+            if image['deleted']:
+                raise exception.NotFound()
         except (exception.NotFound, exception.Forbidden):
             raise webob.exc.HTTPNotFound()
+        return image
 
     def show(self, req, image_id):
         self._enforce(req, 'get_image')
@@ -158,6 +161,8 @@
         context = req.context
         try:
             image = self.db_api.image_get(context, image_id)
+            if image['deleted']:
+                raise exception.NotFound()
         except (exception.NotFound, exception.Forbidden):
             msg = ("Failed to find image %(image_id)s to update" % locals())
             LOG.info(msg)
@@ -268,19 +273,22 @@
                     % locals())
             raise webob.exc.HTTPForbidden(explanation=msg)
 
-        status = 'deleted'
-        if image['location']:
-            if CONF.delayed_delete:
-                status = 'pending_delete'
-                self.store_api.schedule_delayed_delete_from_backend(
-                                image['location'], id)
-            else:
-                self.store_api.safe_delete_from_backend(image['location'],
-                                                        req.context, id)
+        if image['location'] and CONF.delayed_delete:
+            status = 'pending_delete'
+        else:
+            status = 'deleted'
 
         try:
             self.db_api.image_update(req.context, image_id, {'status': status})
             self.db_api.image_destroy(req.context, image_id)
+
+            if image['location']:
+                if CONF.delayed_delete:
+                    self.store_api.schedule_delayed_delete_from_backend(
+                                    image['location'], id)
+                else:
+                    self.store_api.safe_delete_from_backend(image['location'],
+                                                            req.context, id)
         except (exception.NotFound, exception.Forbidden):
             msg = ("Failed to find image %(image_id)s to delete" % locals())
             LOG.info(msg)

=== modified file 'glance/common/utils.py'
--- glance/common/utils.py	2012-09-07 12:17:46 +0000
+++ glance/common/utils.py	2013-01-08 00:34:25 +0000
@@ -118,9 +118,26 @@
         :param fd: Underlying image file object
         """
         self.fd = fd
+        self.iterator = None
+        # NOTE(markwash): if the underlying supports read(), overwrite the
+        # default iterator-based implementation with cooperative_read which
+        # is more straightforward
         if hasattr(fd, 'read'):
             self.read = cooperative_read(fd)
 
+    def read(self, length=None):
+        """Return the next chunk of the underlying iterator.
+
+        This is replaced with cooperative_read in __init__ if the underlying
+        fd already supports read().
+        """
+        if self.iterator is None:
+            self.iterator = self.__iter__()
+        try:
+            return self.iterator.next()
+        except StopIteration:
+            return ''
+
     def __iter__(self):
         return cooperative_iter(self.fd.__iter__())
 

=== modified file 'glance/openstack/common/setup.py'
--- glance/openstack/common/setup.py	2012-09-17 07:44:11 +0000
+++ glance/openstack/common/setup.py	2013-01-08 00:34:25 +0000
@@ -135,15 +135,16 @@
     _run_shell_command("git fetch origin +refs/meta/*:refs/remotes/meta/*")
     milestone_cmd = "git show meta/openstack/release:%s" % branch_name
     milestonever = _run_shell_command(milestone_cmd)
-    if not milestonever:
-        milestonever = ""
+    if milestonever:
+        first_half = "%s~%s" % (milestonever, datestamp)
+    else:
+        first_half = datestamp
     post_version = _get_git_post_version()
     # post version should look like:
     # 0.1.1.4.gcc9e28a
     # where the bit after the last . is the short sha, and the bit between
     # the last and second to last is the revno count
     (revno, sha) = post_version.split(".")[-2:]
-    first_half = "%s~%s" % (milestonever, datestamp)
     second_half = "%s%s.%s" % (revno_prefix, revno, sha)
     return ".".join((first_half, second_half))
 

=== modified file 'glance/store/rbd.py'
--- glance/store/rbd.py	2012-08-16 13:58:32 +0000
+++ glance/store/rbd.py	2013-01-08 00:34:25 +0000
@@ -69,6 +69,9 @@
     """
 
     def process_specs(self):
+        # convert to ascii since librbd doesn't handle unicode
+        for key, value in self.specs.iteritems():
+            self.specs[key] = str(value)
         self.fsid = self.specs.get('fsid')
         self.pool = self.specs.get('pool')
         self.image = self.specs.get('image')
@@ -92,7 +95,14 @@
             reason = _('URI must start with rbd://')
             LOG.error(_("Invalid URI: %(uri)s: %(reason)s") % locals())
             raise exception.BadStoreUri(message=reason)
-        pieces = uri[len(prefix):].split('/')
+        # convert to ascii since librbd doesn't handle unicode
+        try:
+            ascii_uri = str(uri)
+        except UnicodeError:
+            reason = _('URI contains non-ascii characters')
+            LOG.error(_("Invalid URI: %(uri)s: %(reason)s") % locals())
+            raise exception.BadStoreUri(message=reason)
+        pieces = ascii_uri[len(prefix):].split('/')
         if len(pieces) == 1:
             self.fsid, self.pool, self.image, self.snapshot = \
                 (None, None, pieces[0], None)

=== modified file 'glance/tests/functional/v2/test_images.py'
--- glance/tests/functional/v2/test_images.py	2012-09-26 12:32:50 +0000
+++ glance/tests/functional/v2/test_images.py	2013-01-08 00:34:25 +0000
@@ -222,6 +222,12 @@
         self.assertEqual(201, response.status_code)
         image_id = json.loads(response.text)['id']
 
+        # Upload some image data
+        path = self._url('/v2/images/%s/file' % image_id)
+        headers = self._headers({'Content-Type': 'application/octet-stream'})
+        response = requests.put(path, headers=headers, data='ZZZZZ')
+        self.assertEqual(201, response.status_code)
+
         # TENANT1 should see the image in their list
         path = self._url('/v2/images')
         response = requests.get(path, headers=self._headers())
@@ -304,6 +310,12 @@
         response = requests.delete(path, headers=headers)
         self.assertEqual(404, response.status_code)
 
+        # Image data should still be present after the failed delete
+        path = self._url('/v2/images/%s/file' % image_id)
+        response = requests.get(path, headers=self._headers())
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(response.text, 'ZZZZZ')
+
         self.stop_servers()
 
     def test_tag_lifecycle(self):

=== modified file 'glance/tests/stubs.py'
--- glance/tests/stubs.py	2012-09-07 12:17:46 +0000
+++ glance/tests/stubs.py	2013-01-08 00:34:25 +0000
@@ -60,7 +60,13 @@
 
     def getresponse(self):
         mapper = routes.Mapper()
-        api = context.UnauthenticatedContextMiddleware(rserver.API(mapper))
+        server = rserver.API(mapper)
+        # NOTE(markwash): we need to pass through context auth information if
+        # we have it.
+        if 'X-Auth-Token' in self.req.headers:
+            api = utils.FakeAuthMiddleware(server)
+        else:
+            api = context.UnauthenticatedContextMiddleware(server)
         webob_res = self.req.get_response(api)
 
         return utils.FakeHTTPResponse(status=webob_res.status_int,

=== modified file 'glance/tests/unit/test_clients.py'
--- glance/tests/unit/test_clients.py	2012-09-17 07:44:11 +0000
+++ glance/tests/unit/test_clients.py	2013-01-08 00:34:25 +0000
@@ -39,7 +39,7 @@
 UUID2 = _gen_uuid()
 
 #NOTE(bcwaldon): needed to init config_dir cli opt
-config.parse_args()
+config.parse_args(args=[])
 
 
 class TestBadClients(test_utils.BaseTestCase):

=== modified file 'glance/tests/unit/test_store_location.py'
--- glance/tests/unit/test_store_location.py	2012-08-16 13:58:32 +0000
+++ glance/tests/unit/test_store_location.py	2013-01-08 00:34:25 +0000
@@ -290,6 +290,15 @@
         self.assertEqual(None, loc.pool)
         self.assertEqual(None, loc.snapshot)
 
+        uri = u'rbd://imagename'
+        loc = glance.store.rbd.StoreLocation({})
+        loc.parse_uri(uri)
+
+        self.assertEqual('imagename', loc.image)
+        self.assertEqual(None, loc.fsid)
+        self.assertEqual(None, loc.pool)
+        self.assertEqual(None, loc.snapshot)
+
         uri = 'rbd://fsid/pool/image/snap'
         loc = glance.store.rbd.StoreLocation({})
         loc.parse_uri(uri)
@@ -299,6 +308,15 @@
         self.assertEqual('pool', loc.pool)
         self.assertEqual('snap', loc.snapshot)
 
+        uri = u'rbd://fsid/pool/image/snap'
+        loc = glance.store.rbd.StoreLocation({})
+        loc.parse_uri(uri)
+
+        self.assertEqual('image', loc.image)
+        self.assertEqual('fsid', loc.fsid)
+        self.assertEqual('pool', loc.pool)
+        self.assertEqual('snap', loc.snapshot)
+
         uri = 'rbd://%2f/%2f/%2f/%2f'
         loc = glance.store.rbd.StoreLocation({})
         loc.parse_uri(uri)
@@ -308,6 +326,15 @@
         self.assertEqual('/', loc.pool)
         self.assertEqual('/', loc.snapshot)
 
+        uri = u'rbd://%2f/%2f/%2f/%2f'
+        loc = glance.store.rbd.StoreLocation({})
+        loc.parse_uri(uri)
+
+        self.assertEqual('/', loc.image)
+        self.assertEqual('/', loc.fsid)
+        self.assertEqual('/', loc.pool)
+        self.assertEqual('/', loc.snapshot)
+
         bad_uri = 'rbd:/image'
         self.assertRaises(exception.BadStoreUri, loc.parse_uri, bad_uri)
 
@@ -332,6 +359,9 @@
         bad_uri = 'http://///'
         self.assertRaises(exception.BadStoreUri, loc.parse_uri, bad_uri)
 
+        bad_uri = 'rbd://' + unichr(300)
+        self.assertRaises(exception.BadStoreUri, loc.parse_uri, bad_uri)
+
     def test_get_store_from_scheme(self):
         """
         Test that the backend returned by glance.store.get_backend_class

=== modified file 'glance/tests/unit/test_utils.py'
--- glance/tests/unit/test_utils.py	2012-09-07 12:17:46 +0000
+++ glance/tests/unit/test_utils.py	2013-01-08 00:34:25 +0000
@@ -73,6 +73,17 @@
 
         self.assertEquals(bytes_read, BYTES)
 
+    def test_cooperative_reader_of_iterator(self):
+        """Ensure cooperative reader supports iterator backends too"""
+        reader = utils.CooperativeReader([l * 3 for l in 'abcdefgh'])
+        chunks = []
+        while True:
+            chunks.append(reader.read(3))
+            if chunks[-1] == '':
+                break
+        meat = ''.join(chunks)
+        self.assertEqual(meat, 'aaabbbcccdddeeefffggghhh')
+
     def test_limiting_reader(self):
         """Ensure limiting reader class accesses all bytes of file"""
         BYTES = 1024

=== modified file 'glance/tests/unit/v1/test_api.py'
--- glance/tests/unit/v1/test_api.py	2012-09-17 07:44:11 +0000
+++ glance/tests/unit/v1/test_api.py	2013-01-08 00:34:25 +0000
@@ -103,7 +103,8 @@
         """Establish a clean test environment"""
         super(TestRegistryAPI, self).setUp()
         self.mapper = routes.Mapper()
-        self.api = test_utils.FakeAuthMiddleware(rserver.API(self.mapper))
+        self.api = test_utils.FakeAuthMiddleware(rserver.API(self.mapper),
+                                                 is_admin=True)
         self.FIXTURES = [
             {'id': UUID1,
              'name': 'fake image #1',
@@ -197,6 +198,38 @@
         res = req.get_response(self.api)
         self.assertEquals(res.status_int, 404)
 
+    def test_show_deleted_image_as_admin(self):
+        """
+        Tests that the /images/<id> registry API endpoint
+        returns a 200 for deleted image to admin user.
+        """
+        # Delete image #2
+        req = webob.Request.blank('/images/%s' % UUID2)
+        req.method = 'DELETE'
+        res = req.get_response(self.api)
+        self.assertEquals(res.status_int, 200)
+
+        req = webob.Request.blank('/images/%s' % UUID2)
+        res = req.get_response(self.api)
+        self.assertEquals(res.status_int, 200)
+
+    def test_show_deleted_image_as_nonadmin(self):
+        """
+        Tests that the /images/<id> registry API endpoint
+        returns a 404 for deleted image to non-admin user.
+        """
+        # Delete image #2
+        req = webob.Request.blank('/images/%s' % UUID2)
+        req.method = 'DELETE'
+        res = req.get_response(self.api)
+        self.assertEquals(res.status_int, 200)
+
+        api = test_utils.FakeAuthMiddleware(rserver.API(self.mapper),
+                                            is_admin=False)
+        req = webob.Request.blank('/images/%s' % UUID2)
+        res = req.get_response(api)
+        self.assertEquals(res.status_int, 404)
+
     def test_get_root(self):
         """
         Tests that the root registry API returns "index",
@@ -2331,6 +2364,36 @@
         """Tests delayed activation of image with missing container format"""
         self._do_test_put_image_content_missing_format('container_format')
 
+    def test_update_deleted_image(self):
+        """Tests that exception raised trying to update a deleted image"""
+        req = webob.Request.blank("/images/%s" % UUID2)
+        req.method = 'DELETE'
+        res = req.get_response(self.api)
+        self.assertEquals(res.status_int, 200)
+
+        fixture = {'name': 'test_del_img'}
+        req = webob.Request.blank('/images/%s' % UUID2)
+        req.method = 'PUT'
+        req.content_type = 'application/json'
+        req.body = json.dumps(dict(image=fixture))
+
+        res = req.get_response(self.api)
+        self.assertEquals(res.status_int, webob.exc.HTTPForbidden.code)
+        self.assertTrue('Forbidden to update deleted image' in res.body)
+
+    def test_delete_deleted_image(self):
+        """Tests that exception raised trying to delete a deleted image"""
+        req = webob.Request.blank("/images/%s" % UUID2)
+        req.method = 'DELETE'
+        res = req.get_response(self.api)
+        self.assertEquals(res.status_int, 200)
+
+        req = webob.Request.blank("/images/%s" % UUID2)
+        req.method = 'DELETE'
+        res = req.get_response(self.api)
+        self.assertEquals(res.status_int, webob.exc.HTTPForbidden.code)
+        self.assertTrue('Forbidden to delete a deleted image' in res.body)
+
     def test_register_and_upload(self):
         """
         Test that the process of registering an image with
@@ -2929,6 +2992,26 @@
         res = req.get_response(self.api)
         self.assertEquals(res.status_int, webob.exc.HTTPNotFound.code)
 
+    def test_delete_not_allowed(self):
+        # Verify we can get the image data
+        req = webob.Request.blank("/images/%s" % UUID2)
+        req.method = 'GET'
+        req.headers['X-Auth-Token'] = 'user:tenant:'
+        res = req.get_response(self.api)
+        self.assertEqual(res.status_int, 200)
+        self.assertEqual(len(res.body), 19)
+
+        # Verify we cannot delete the image
+        req.method = 'DELETE'
+        res = req.get_response(self.api)
+        self.assertEqual(res.status_int, 403)
+
+        # Verify the image data is still there
+        req.method = 'GET'
+        res = req.get_response(self.api)
+        self.assertEqual(res.status_int, 200)
+        self.assertEqual(len(res.body), 19)
+
     def test_delete_queued_image(self):
         """Delete an image in a queued state
 

=== modified file 'glance/tests/unit/v2/test_images_resource.py'
--- glance/tests/unit/v2/test_images_resource.py	2012-09-17 07:44:11 +0000
+++ glance/tests/unit/v2/test_images_resource.py	2013-01-08 00:34:25 +0000
@@ -108,6 +108,20 @@
         expected = set([UUID3])
         self.assertEqual(actual, expected)
 
+    def test_index_admin(self):
+        request = unit_test_utils.get_fake_request(is_admin=True)
+        output = self.controller.index(request)
+        self.assertEqual(3, len(output['images']))
+
+    def test_index_admin_deleted_images_hidden(self):
+        request = unit_test_utils.get_fake_request(is_admin=True)
+        self.controller.delete(request, UUID1)
+        output = self.controller.index(request)
+        self.assertEqual(2, len(output['images']))
+        actual = set([image['id'] for image in output['images']])
+        expected = set([UUID2, UUID3])
+        self.assertEqual(actual, expected)
+
     def test_index_return_parameters(self):
         self.config(limit_param_default=1, api_limit_max=3)
         request = unit_test_utils.get_fake_request()
@@ -319,6 +333,12 @@
         self.assertRaises(webob.exc.HTTPNotFound,
                           self.controller.show, request, image_id)
 
+    def test_show_deleted_image_admin(self):
+        request = unit_test_utils.get_fake_request(is_admin=True)
+        self.controller.delete(request, UUID1)
+        self.assertRaises(webob.exc.HTTPNotFound,
+                          self.controller.show, request, UUID1)
+
     def test_create(self):
         request = unit_test_utils.get_fake_request()
         image = {'name': 'image-1'}
@@ -376,6 +396,12 @@
         self.assertRaises(webob.exc.HTTPNotFound, self.controller.update,
                           request, utils.generate_uuid(), changes=[])
 
+    def test_update_deleted_image_admin(self):
+        request = unit_test_utils.get_fake_request(is_admin=True)
+        self.controller.delete(request, UUID1)
+        self.assertRaises(webob.exc.HTTPNotFound, self.controller.update,
+                          request, UUID1, changes=[])
+
     def test_update_replace_base_attribute(self):
         self.db.image_update(None, UUID1, {'properties': {'foo': 'bar'}})
         request = unit_test_utils.get_fake_request()
@@ -608,6 +634,12 @@
         self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete,
                           request, utils.generate_uuid())
 
+    def test_delete_already_deleted_image_admin(self):
+        request = unit_test_utils.get_fake_request(is_admin=True)
+        self.controller.delete(request, UUID1)
+        self.assertRaises(webob.exc.HTTPNotFound,
+                          self.controller.delete, request, UUID1)
+
     def test_index_with_invalid_marker(self):
         fake_uuid = utils.generate_uuid()
         request = unit_test_utils.get_fake_request()

=== modified file 'glance/tests/utils.py'
--- glance/tests/utils.py	2012-09-07 12:17:46 +0000
+++ glance/tests/utils.py	2013-01-08 00:34:25 +0000
@@ -57,7 +57,7 @@
         #NOTE(bcwaldon): parse_args has to be called to register certain
         # command-line options - specifically we need config_dir for
         # the following policy tests
-        config.parse_args()
+        config.parse_args(args=[])
 
     def tearDown(self):
         super(BaseTestCase, self).tearDown()
@@ -347,7 +347,7 @@
 
 class FakeAuthMiddleware(wsgi.Middleware):
 
-    def __init__(self, app, is_admin=True):
+    def __init__(self, app, is_admin=False):
         super(FakeAuthMiddleware, self).__init__(app)
         self.is_admin = is_admin
 
@@ -368,6 +368,7 @@
             'tenant': tenant,
             'roles': roles,
             'is_admin': self.is_admin,
+            'auth_tok': auth_tok,
         }
 
         req.context = context.RequestContext(**kwargs)

=== modified file 'glance/version.py'
--- glance/version.py	2012-08-16 13:58:32 +0000
+++ glance/version.py	2013-01-08 00:34:25 +0000
@@ -17,6 +17,6 @@
 
 from glance.openstack.common import version as common_version
 
-NEXT_VERSION = '2012.2'
+NEXT_VERSION = '2012.2.1'
 version_info = common_version.VersionInfo('glance',
                                           pre_version=NEXT_VERSION)

=== modified file 'glance/versioninfo'
--- glance/versioninfo	2012-09-26 12:37:00 +0000
+++ glance/versioninfo	2013-01-08 00:34:25 +0000
@@ -1,1 +1,1 @@
-2012.2~rc3~20120926.r1.ga9f0a4c
+2012.2.1

=== modified file 'run_tests.sh'
--- run_tests.sh	2012-08-16 13:58:32 +0000
+++ run_tests.sh	2013-01-08 00:34:25 +0000
@@ -24,8 +24,9 @@
     -N|--no-virtual-env) let always_venv=0; let never_venv=1;;
     -p|--pep8) let just_pep8=1;;
     -f|--force) let force=1;;
-    --unittests-only) noseargs="$noseargs --exclude-dir=glance/tests/functional";;
-    -c|--coverage) noseargs="$noseargs --with-coverage --cover-package=glance";;
+    --unittests-only) noseopts="$noseopts --exclude-dir=glance/tests/functional";;
+    -c|--coverage) noseopts="$noseopts --with-coverage --cover-package=glance";;
+    -*) noseopts="$noseopts $1";;
     *) noseargs="$noseargs $1"
   esac
 }
@@ -35,6 +36,7 @@
 always_venv=0
 never_venv=0
 force=0
+noseopts=
 noseargs=
 wrapper=""
 just_pep8=0
@@ -67,7 +69,7 @@
 }
 
 
-NOSETESTS="nosetests $noseargs"
+NOSETESTS="nosetests $noseopts $noseargs"
 
 if [ $never_venv -eq 0 ]
 then

=== modified file 'tools/pip-requires'
--- tools/pip-requires	2012-09-17 07:44:11 +0000
+++ tools/pip-requires	2013-01-08 00:34:25 +0000
@@ -3,7 +3,7 @@
 # package to get the right headers...
 greenlet>=0.3.1
 
-SQLAlchemy>=0.7
+SQLAlchemy>=0.7,<=0.7.9
 anyjson
 eventlet>=0.9.12
 PasteDeploy