Branch: refs/heads/stable/1.7.x
  Home:   https://github.com/django/django
  Commit: ab0afef9590730064d40ca074c3b2be3baebf9cb
      
https://github.com/django/django/commit/ab0afef9590730064d40ca074c3b2be3baebf9cb
  Author: Aymeric Augustin <aymeric.augus...@m4x.org>
  Date:   2014-04-21 (Mon, 21 Apr 2014)

  Changed paths:
    A tests/model_inheritance/same_model_name/__init__.py
    A tests/model_inheritance/same_model_name/models.py
    M tests/model_inheritance/tests.py
    R tests/model_inheritance_same_model_name/__init__.py
    R tests/model_inheritance_same_model_name/models.py
    R tests/model_inheritance_same_model_name/tests.py

  Log Message:
  -----------
  [1.7.x] Fixed #22402 -- Consolidated model_inheritance tests.

The model_inheritance_same_model_name tests couldn't be run without the
model_inheritance tests. Make the problem go away by merging them.

Thanks timo for the report.

Backport of 0097d38 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 django-updates+unsubscr...@googlegroups.com.
To post to this group, send email to django-updates@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/django-updates/5354e851a1a97_77afd17d3891922%40hookshot-fe2-cp1-prd.iad.github.net.mail.
For more options, visit https://groups.google.com/d/optout.

Reply via email to