Merge lp:~corey.bryant/glance/2015.1.1 into lp:~ubuntu-server-dev/glance/kilo

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-04 13:53:06 +0000
+++ debian/changelog	2015-08-04 14:55:40 +0000
@@ -1,3 +1,20 @@
+glance (1:2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/kilo (45f9132) (LP: #1481008):
+    - [899a8b9] Remove usage of assert_called_once in mocks
+    - [d1f54b7] Fix OSProfiler exception when is enabled
+    - [5baf018] Add client_socket_timeout option
+    - [abc2a0c] Change status code from 500 to 400 for image update request
+    - [88f92eb] Save image data after setting the data
+    - [9faec58] Make sure the converted image is imported
+    - [a6f4a9c] Remove ordereddict from requirements
+    - [a102ebe] Fixed error message for negative values of min_disk and min_ram
+    - [870e2d5] Return empty str for permissive, none, properties
+    - [45f9132] Fix test_opts to not resolve requirements
+  * d/p/fix-requirements.patch: Dropped. No longer needed.
+
+ -- Corey Bryant <[e-mail]>  Tue, 04 Aug 2015 10:31:54 -0400
+
 glance (1:2015.1.0-0ubuntu2) vivid; urgency=medium
 
   * d/p/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch: 
 
=== removed file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2015-04-10 18:17:03 +0000
+++ debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-diff -Naurp glance-2015.1.0rc1.orig/requirements.txt glance-2015.1.0rc1/requirements.txt
---- glance-2015.1.0rc1.orig/requirements.txt	2015-04-10 11:49:16.000000000 -0400
-+++ glance-2015.1.0rc1/requirements.txt	2015-04-10 14:14:36.411750864 -0400
-@@ -21,7 +21,6 @@ httplib2>=0.7.5
- kombu>=2.5.0
- pycrypto>=2.6
- iso8601>=0.1.9
--ordereddict
- oslo.config>=1.9.3,<1.10.0  # Apache-2.0
- oslo.concurrency>=1.8.0,<1.9.0         # Apache-2.0
- oslo.context>=0.2.0,<0.3.0                     # Apache-2.0
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2015-08-04 13:54:24 +0000
+++ debian/patches/series	2015-08-04 14:55:40 +0000
@@ -1,3 +1,2 @@
 sql_conn.patch
-fix-requirements.patch
 0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch