Branch: refs/heads/stable/1.7.x
  Home:   https://github.com/django/django
  Commit: fa4b6482df08d308fe88044b8c8bf981c6225fb8
      
https://github.com/django/django/commit/fa4b6482df08d308fe88044b8c8bf981c6225fb8
  Author: AndrĂ© Ericson <[email protected]>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M django/contrib/contenttypes/fields.py
    M django/db/models/fields/related.py
    M docs/releases/1.7.1.txt
    M tests/generic_relations/tests.py
    M tests/get_or_create/models.py
    M tests/get_or_create/tests.py

  Log Message:
  -----------
  [1.7.x] Fixed #23611 -- update_or_create failing from a related manager

Added update_or_create to RelatedManager, ManyRelatedManager and
GenericRelatedObjectManager.
Added missing get_or_create to GenericRelatedObjectManager.

Conflicts:
        tests/generic_relations/tests.py
        tests/get_or_create/tests.py

Backport of ed37f7e979 from master


-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/django-updates/5434623c78429_66203fd9e83652c0935b4%40hookshot-fe1-cp1-prd.iad.github.net.mail.
For more options, visit https://groups.google.com/d/optout.

Reply via email to