Skip to content

Commit

Permalink
Make linter happy, update CHANGELOG for #322 and #325
Browse files Browse the repository at this point in the history
  • Loading branch information
jschneier committed Jun 7, 2017
1 parent 153aa40 commit 259beac
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ django-storages change log
* **Breaking:** Remove backends deprecated in v1.5.1 (`#280`_)
* **Breaking:** The ``SFTPStorage`` backend now checks for the existence of the fallback ``~/.ssh/known_hosts``
before attempting to load it. If you had previously been passing in a path to a non-existent file it will no longer
attempt to load the fallback.
attempt to load the fallback. (`issue #118`_ `pr #325`_)
* **Deprecation:** The undocumented ``gs.GSBotoStorage`` backend. See the new ``gcloud.GoogleCloudStorage``
or ``apache_libcloud.LibCloudStorage`` backends instead. (`#236`_)
* Add a new backend, ``gcloud.GoogleCloudStorage`` based on the ``google-cloud`` bindings. (`#236`_ thanks @scjody)
Expand All @@ -21,6 +21,7 @@ django-storages change log
* Files that have a guessable encoding (e.g. gzip or compress) will be uploaded with that Content-Encoding in
the ``s3boto3`` backend (issue `#263`_ pr `#264`_ thanks @ldng)
* The Dropbox backend now properly translates backslashes in Windows paths into forward slashes (`e52a127`_)
* The S3 backends now permit colons in the keys (`issue #248`_ `pr #322`_)

.. _#217: https://github.com/jschneier/django-storages/pull/217
.. _#216: https://github.com/jschneier/django-storages/issues/216
Expand All @@ -35,6 +36,10 @@ django-storages change log
.. _#264: https://github.com/jschneier/django-storages/pull/264
.. _e52a127: https://github.com/jschneier/django-storages/commit/e52a127523fdd5be50bb670ccad566c5d527f3d1
.. _#236: https://github.com/jschneier/django-storages/pull/236
.. _issue #118: https://github.com/jschneier/django-storages/issues/118
.. _pr #325: https://github.com/jschneier/django-storages/pull/325
.. _issue #248: https://github.com/jschneier/django-storages/issues/248
.. _pr #322: https://github.com/jschneier/django-storages/pull/322

1.5.2 (2017-01-13)
******************
Expand Down
1 change: 0 additions & 1 deletion storages/backends/sftpstorage.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ def _connect(self):
if os.path.exists(known_host_file):
self._ssh.load_host_keys(known_host_file)


# and automatically add new host keys for hosts we haven't seen before.
self._ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())

Expand Down

0 comments on commit 259beac

Please sign in to comment.