From 2e6e7ff9c86c212d5df943d99d5a113741a2daf7 Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wwitzel@redhat.com>
Date: Mon, 14 Mar 2016 14:42:09 -0400
Subject: [PATCH] Updating migration path for RBAC

---
 awx/main/migrations/0007_v300_rbac_changes.py | 16 ++++++++++
 .../migrations/0009_v300_rbac_drop_fields.py  | 29 -------------------
 2 files changed, 16 insertions(+), 29 deletions(-)
 delete mode 100644 awx/main/migrations/0009_v300_rbac_drop_fields.py

diff --git a/awx/main/migrations/0007_v300_rbac_changes.py b/awx/main/migrations/0007_v300_rbac_changes.py
index 89252ca12c..bdbdac4486 100644
--- a/awx/main/migrations/0007_v300_rbac_changes.py
+++ b/awx/main/migrations/0007_v300_rbac_changes.py
@@ -18,6 +18,22 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.RenameField(
+            'Organization',
+            'admins',
+            'deprecated_admins',
+        ),
+        migrations.RenameField(
+            'Organization',
+            'users',
+            'deprecated_users',
+        ),
+        migrations.RenameField(
+            'Team',
+            'users',
+            'deprecated_users',
+        ),
+
         migrations.CreateModel(
             name='Role',
             fields=[
diff --git a/awx/main/migrations/0009_v300_rbac_drop_fields.py b/awx/main/migrations/0009_v300_rbac_drop_fields.py
deleted file mode 100644
index c8f4c15fc9..0000000000
--- a/awx/main/migrations/0009_v300_rbac_drop_fields.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('main', '0008_v300_rbac_migrations'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            'Organization',
-            'admins',
-            'deprecated_admins',
-        ),
-        migrations.RenameField(
-            'Organization',
-            'users',
-            'deprecated_users',
-        ),
-        migrations.RenameField(
-            'Team',
-            'users',
-            'deprecated_users',
-        ),
-    ]