[Python-modules-commits] [python-django] 04/06: Merge tag 'upstream/1.8.18' into debian/jessie-backports

[Raphaël Hertzog]

This is an automated email from the git hooks/post-receive script.

hertzog pushed a commit to branch debian/jessie-backports
in repository python-django.

commit c22dd61632bd87f410eba54534d0cf69563e987b
Merge: 3bf3b44 4a29843
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Sat May 20 15:34:03 2017 +0200

    Merge tag 'upstream/1.8.18' into debian/jessie-backports
    
    Upstream version 1.8.18

 .gitattributes                                  |  5 --
 .gitignore                                      | 13 -----
 .hgignore                                       | 15 -----
 .tx/config                                      | 73 -------------------------
 CONTRIBUTING.rst                                | 26 ---------
 Django.egg-info/PKG-INFO                        |  2 +-
 Django.egg-info/SOURCES.txt                     |  9 +--
 PKG-INFO                                        |  2 +-
 django/__init__.py                              |  2 +-
 django/contrib/admin/bin/compress.py            | 53 ------------------
 django/contrib/sitemaps/tests/test_flatpages.py | 62 ---------------------
 django/db/backends/oracle/creation.py           |  4 +-
 django/utils/http.py                            | 66 +++++++++++++++++++++-
 django/views/static.py                          | 22 ++------
 docs/_ext/djangodocs.py                         |  3 +
 docs/_ext/ticket_role.py                        |  1 +
 docs/conf.py                                    |  3 -
 docs/ref/databases.txt                          |  7 ++-
 docs/ref/request-response.txt                   |  2 +-
 docs/releases/1.8.17.txt                        | 14 +++++
 docs/releases/1.8.18.txt                        | 30 ++++++++++
 docs/releases/index.txt                         |  2 +
 docs/releases/security.txt                      | 26 +++++++++
 setup.cfg                                       |  3 +-
 tests/backends/tests.py                         |  4 +-
 tests/gis_tests/test_geoip.py                   |  2 +-
 tests/requirements/base.txt                     |  2 +-
 tests/requirements/oracle.txt                   |  2 +-
 tests/utils_tests/test_http.py                  |  5 +-
 29 files changed, 168 insertions(+), 292 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git