Merge pull request #1197 from anoek/rbac

Fixed up migrations after last merge

awx/main/migrations/0006_v300_active_flag_removal.py

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

awx/main/migrations/0007_v300_rbac_changes.py

@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         ('taggit', '0002_auto_20150616_2121'),
         ('contenttypes', '0002_remove_content_type_name'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('main', '0005_v300_active_field_changes'),
+        ('main', '0006_v300_active_flag_removal'),
     ]
 
     operations = [

awx/main/migrations/0008_v300_rbac_migrations.py

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

awx/main/migrations/0009_v300_rbac_drop_fields.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0007_v300_rbac_migrations'),
+        ('main', '0008_v300_rbac_migrations'),
     ]
 
     operations = [