-
Committer:
Corey Bryant
-
Date:
2015-08-04 14:54:36 UTC
-
Revision ID:
corey.bryant@canonical.com-20150804145436-1alo0j3z7a3ia4gi
* 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.