Merge branch 'mongoectomy_implementation' into devel

This commit is contained in:
Chris Meyers
2016-03-01 08:22:40 -05:00
31 changed files with 5095 additions and 705 deletions

View File

@@ -18,6 +18,7 @@ from awx.main.models.activity_stream import * # noqa
from awx.main.models.ha import * # noqa
from awx.main.models.configuration import * # noqa
from awx.main.models.notifications import * # noqa
from awx.main.models.fact import * # noqa
# Monkeypatch Django serializer to ignore django-taggit fields (which break
# the dumpdata command; see https://github.com/alex/django-taggit/issues/155).