Merge branch 'devel' into rbac

awx/main/migrations/0003_v300_notification_changes.py

@@ -13,7 +13,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('taggit', '0002_auto_20150616_2121'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('main', '0002_v300_changes'),
+        ('main', '0002_v300_tower_settings_changes'),
     ]
 
     operations = [

awx/main/migrations/0004_v300_fact_changes.py

@@ -8,7 +8,7 @@ import jsonbfield.fields
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0003_v300_changes'),
+        ('main', '0003_v300_notification_changes'),
     ]
 
     operations = [

awx/main/migrations/0005_v300_migrate_facts.py

@@ -7,7 +7,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0007_v300_rbac_migrations'),
+        ('main', '0004_v300_fact_changes'),
     ]
 
     operations = [

awx/main/migrations/0006_v300_create_system_job_templates.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
+from django.db import migrations
 from django.utils.timezone import now
 
 from awx.api.license import feature_enabled
@@ -107,7 +107,7 @@ def create_system_job_templates(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0005_v300_changes'),
+        ('main', '0005_v300_migrate_facts'),
     ]
 
     operations = [