Merge trunk

2011-03-25 14:33:54 -04:00
parent 6852c9ee1f 81ecca0470
commit cd150fbe32
15 changed files with 953 additions and 370 deletions
--- a/glance/store/http.py
+++ b/glance/store/http.py
@@ -24,7 +24,7 @@ class HTTPBackend(glance.store.Backend):
    """ An implementation of the HTTP Backend Adapter """

    @classmethod
-    def get(cls, parsed_uri, expected_size, conn_class=None):
+    def get(cls, parsed_uri, expected_size, options=None, conn_class=None):
        """Takes a parsed uri for an HTTP resource, fetches it, and yields the
        data.
        """