diff options
| author | Peter Portante <peter.portante@redhat.com> | 2013-10-24 16:15:25 -0400 |
|---|---|---|
| committer | Luis Pabon <lpabon@redhat.com> | 2013-10-28 11:51:51 -0700 |
| commit | 286a1308db72c5cfdd6ce16aff3f291ebce257c2 (patch) | |
| tree | aabb3c54a29d6236f5ade0a229c477378a6c832c /gluster/swift/proxy | |
| parent | 6b8d7c59195327484ac0f14bd1c29e4f75415e3b (diff) | |
Rebase to OpenStack Swift Havana (1.10.0)
Change-Id: I90821230a1a7100c74d97cccc9c445251d0f65e7
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/6157
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>
Diffstat (limited to 'gluster/swift/proxy')
| -rw-r--r-- | gluster/swift/proxy/server.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gluster/swift/proxy/server.py b/gluster/swift/proxy/server.py index 512b9bb..3254409 100644 --- a/gluster/swift/proxy/server.py +++ b/gluster/swift/proxy/server.py @@ -18,11 +18,14 @@ # needs import gluster.swift.common.constraints # noqa -from swift.proxy import server +from swift.proxy.server import Application, mimetypes # noqa +from swift.proxy.controllers import AccountController # noqa +from swift.proxy.controllers import ObjectController # noqa +from swift.proxy.controllers import ContainerController # noqa def app_factory(global_conf, **local_conf): # noqa """paste.deploy app factory for creating WSGI proxy apps.""" conf = global_conf.copy() conf.update(local_conf) - return server.Application(conf) + return Application(conf) |