diff options
| author | Charlie Denton <charleswdenton@gmail.com> | 2017-10-31 17:22:27 +0000 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-10-31 21:57:00 -0400 |
| commit | 2e6dd975a228d8a590248da38a2b6f4e74876260 (patch) | |
| tree | f7d3fb46b64a05fdafcf0e5537595c57eb1052ec /django/db/models/options.py | |
| parent | 542e6b0207850432e225596bc6faacb297f71382 (diff) | |
[2.0.x] Fixed #28750 -- Allowed models to define Meta.manager_inheritance_from_future for backwards compatibility.
Refs 631f4ab06112aca5bd6a57b81159048f936050bf.
Backport of cbe334918a0a80762249706a15b699714b5dc828 from master
Diffstat (limited to 'django/db/models/options.py')
| -rw-r--r-- | django/db/models/options.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/models/options.py b/django/db/models/options.py index 0786e525b3..666885aeed 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -35,6 +35,8 @@ DEFAULT_NAMES = ( 'select_on_save', 'default_related_name', 'required_db_features', 'required_db_vendor', 'base_manager_name', 'default_manager_name', 'indexes', + # For backwards compatibility with Django 1.11. RemovedInDjango30Warning + 'manager_inheritance_from_future', ) |