[Python-modules-commits] [python-django] 02/03: Merge tag 'upstream/1.7.4' into debian/experimental

[Raphaël Hertzog]

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

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

commit 45bc37057170a599f51acb3f29ce1c7d06a36b03
Merge: 459109c bd3fd2f
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Wed Jan 28 09:36:46 2015 +0100

    Merge tag 'upstream/1.7.4' into debian/experimental
    
    Upstream version 1.7.4

 Django.egg-info/PKG-INFO                     |   2 +-
 Django.egg-info/SOURCES.txt                  |   3 +
 PKG-INFO                                     |   2 +-
 django/__init__.py                           |   2 +-
 django/contrib/auth/management/__init__.py   |   5 +
 django/contrib/auth/tests/test_management.py |  20 +++-
 django/contrib/contenttypes/management.py    |   5 +
 django/contrib/contenttypes/tests/tests.py   |  23 +++-
 django/contrib/sessions/tests.py             |   5 +-
 django/db/backends/schema.py                 |  29 +++--
 django/db/backends/sqlite3/schema.py         |   9 +-
 django/db/migrations/loader.py               |  12 +++
 django/db/migrations/operations/models.py    |  21 ++++
 django/http/__init__.py                      |   5 +-
 django/http/response.py                      |  18 ++++
 django/views/static.py                       |   8 +-
 docs/howto/custom-management-commands.txt    |  14 ++-
 docs/internals/deprecation.txt               |  35 ++++--
 docs/internals/release-process.txt           |   6 +-
 docs/intro/tutorial01.txt                    |  12 +--
 docs/intro/tutorial03.txt                    |   2 +-
 docs/ref/contrib/admin/index.txt             |   4 +-
 docs/ref/contrib/contenttypes.txt            |  25 +++--
 docs/ref/contrib/sites.txt                   |  10 +-
 docs/ref/models/querysets.txt                |  19 ++--
 docs/ref/utils.txt                           |  12 ++-
 docs/releases/1.4.19.txt                     |  16 +++
 docs/releases/1.7.4.txt                      |  26 +++++
 docs/releases/1.7.txt                        |  36 ++++++-
 docs/releases/index.txt                      |   2 +
 docs/topics/http/shortcuts.txt               |   4 +-
 docs/topics/http/views.txt                   |   7 +-
 docs/topics/testing/tools.txt                |   2 +-
 setup.cfg                                    |   2 +-
 tests/i18n/test_extraction.py                |   7 +-
 tests/migrations/test_operations.py          |  26 +++++
 tests/migrations/test_writer.py              | 112 +++++++++-----------
 tests/model_regress/tests.py                 |  18 ++--
 tests/requests/tests.py                      |   3 +-
 tests/schema/fields.py                       |  54 ++++++++++
 tests/schema/models.py                       |  10 ++
 tests/schema/tests.py                        | 153 ++++++++++++++++++++++++++-
 tests/view_tests/tests/test_static.py        |  10 +-
 43 files changed, 627 insertions(+), 169 deletions(-)

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