Merge lp:~corey.bryant/glance/2014.1.3 into lp:~ubuntu-server-dev/glance/icehouse

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-11 14:15:40 +0000
+++ debian/changelog	2014-10-03 15:33:15 +0000
@@ -1,3 +1,15 @@
+glance (1:2014.1.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (01ebe84) (LP: #1377136):
+    - [f43b1c2] Block sqlalchemy-migrate 0.9.2
+    - [d0453ae] Check on schemes not stores
+    - [bba31d0] Fix collection order issues and unit test failures
+    - [31a4d18] Enforce image_size_cap on v2 upload
+    - [fcc9379] Fix image killed after deletion
+    - [01ebe84] Set python hash seed to 0 in tox.ini
+
+ -- Corey Bryant <[e-mail]>  Fri, 03 Oct 2014 10:23:08 -0400
+
 glance (1:2014.1.2-0ubuntu1) trusty; urgency=medium
 
   [ Corey Bryant ]