[Python-modules-commits] [python-django] 03/10: Merge branch 'upstream/1.8.x' 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 ce6fdafe14e3648b690fa7ebab1b7903665dadb0
Merge: f2f4a50 8e72530
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Tue Jan 5 10:45:15 2016 +0100

    Merge branch 'upstream/1.8.x' into debian/jessie-backports

 AUTHORS                                            |   1 +
 Django.egg-info/PKG-INFO                           |   3 +-
 Django.egg-info/SOURCES.txt                        |   5 +
 PKG-INFO                                           |   3 +-
 django/__init__.py                                 |   2 +-
 django/conf/project_template/project_name/urls.py  |   3 +-
 django/contrib/admin/helpers.py                    |   1 +
 .../contrib/gis/management/commands/inspectdb.py   |   4 +-
 django/contrib/postgres/fields/array.py            |   6 +-
 django/core/cache/backends/base.py                 |   2 +-
 django/core/management/commands/inspectdb.py       |   8 +-
 django/core/management/commands/loaddata.py        |  10 +
 django/db/backends/postgresql_psycopg2/schema.py   |  62 ++++--
 django/db/migrations/operations/models.py          |   1 +
 django/db/migrations/operations/special.py         |   2 +-
 django/db/models/expressions.py                    |   3 +-
 django/db/models/fields/files.py                   |   2 +-
 django/db/models/fields/subclassing.py             |   2 +-
 django/utils/cache.py                              |   1 +
 django/utils/formats.py                            |   8 +-
 django/utils/translation/trans_real.py             |  33 ++--
 docs/faq/install.txt                               |   2 +-
 docs/howto/custom-lookups.txt                      |   8 +-
 docs/howto/static-files/deployment.txt             |   2 +-
 docs/intro/tutorial03.txt                          |  14 +-
 docs/man/django-admin.1                            |   2 +-
 docs/ref/contrib/gis/geos.txt                      |  12 +-
 docs/ref/contrib/postgres/fields.txt               |   4 +-
 docs/ref/django-admin.txt                          |   4 +-
 docs/ref/forms/validation.txt                      |   2 +-
 docs/ref/models/fields.txt                         |   2 +-
 docs/ref/models/relations.txt                      |   2 +-
 docs/ref/templates/api.txt                         |   7 +-
 docs/releases/1.7.txt                              |   4 +-
 docs/releases/1.8.8.txt                            |  60 ++++++
 docs/releases/1.8.txt                              |  18 ++
 docs/releases/index.txt                            |   1 +
 docs/releases/security.txt                         | 213 ++++++++++++++++-----
 docs/topics/auth/customizing.txt                   |  10 +-
 docs/topics/auth/default.txt                       |   2 +-
 docs/topics/db/managers.txt                        |   4 +-
 docs/topics/files.txt                              |   4 +-
 docs/topics/http/shortcuts.txt                     |   9 +-
 docs/topics/i18n/formatting.txt                    |   5 +-
 setup.py                                           |   1 +
 tests/admin_views/admin.py                         |   4 +-
 tests/admin_views/models.py                        |   2 +
 tests/admin_views/tests.py                         |  25 ++-
 tests/admin_widgets/tests.py                       |   2 +
 tests/decorators/tests.py                          |  12 ++
 tests/expressions_case/tests.py                    |  12 ++
 tests/fixtures/tests.py                            |  14 +-
 .../i18n/commands/locale/xxx/LC_MESSAGES/django.mo | Bin 0 -> 457 bytes
 .../i18n/commands/locale/xxx/LC_MESSAGES/django.po |  21 ++
 tests/i18n/other/locale/fr/__init__.py             |   0
 tests/i18n/other/locale/fr/formats.py              |   2 +
 tests/i18n/tests.py                                |  28 ++-
 tests/inspectdb/models.py                          |   9 +-
 tests/inspectdb/tests.py                           |  13 +-
 tests/migrations/test_operations.py                |  84 ++++++++
 tests/postgres_tests/test_array.py                 |   7 +
 tests/schema/tests.py                              |  68 +++++++
 tests/urlpatterns_reverse/tests.py                 |   2 +-
 63 files changed, 703 insertions(+), 156 deletions(-)

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