diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-06-25 13:37:21 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-06-25 13:37:21 -0700 |
| commit | af4414a85f3354a432e29ecf8cf39ffd926371e3 (patch) | |
| tree | 34da18957bceb784aff8cd5c413fa8e8273068e9 /mediagoblin/storage/cloudfiles.py | |
| parent | 5a1be074c0522c2151ab735eeb30a60c07ff7f7c (diff) | |
| parent | 7fa4e19fc4e7d04175549ea2f21f8b741fbe69f2 (diff) | |
| download | mediagoblin-af4414a85f3354a432e29ecf8cf39ffd926371e3.tar.lz mediagoblin-af4414a85f3354a432e29ecf8cf39ffd926371e3.tar.xz mediagoblin-af4414a85f3354a432e29ecf8cf39ffd926371e3.zip | |
Merge remote-tracking branch 'upstream/master' into auth
Conflicts:
mediagoblin/app.py
mediagoblin/auth/forms.py
mediagoblin/auth/tools.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/edit/views.py
mediagoblin/plugins/basic_auth/tools.py
mediagoblin/tests/test_edit.py
Diffstat (limited to 'mediagoblin/storage/cloudfiles.py')
| -rw-r--r-- | mediagoblin/storage/cloudfiles.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/storage/cloudfiles.py b/mediagoblin/storage/cloudfiles.py index b6e57c91..250f06d4 100644 --- a/mediagoblin/storage/cloudfiles.py +++ b/mediagoblin/storage/cloudfiles.py @@ -75,7 +75,7 @@ class CloudFilesStorage(StorageInterface): _log.debug('Container: {0}'.format( self.container.name)) - self.container_uri = self.container.public_uri() + self.container_uri = self.container.public_ssl_uri() def _resolve_filepath(self, filepath): return '/'.join( |