From 2c690c82d942c56b665a09635a20ea82b7bb76fe Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Tue, 1 Mar 2016 15:34:06 -0500 Subject: [PATCH] Renamed rbac migrations to be after the notification and fact migrations --- .../migrations/0005_v300_active_field_changes.py | 16 ++++++++++++++++ ...rbac_changes.py => 0006_v300_rbac_changes.py} | 2 +- ...igrations.py => 0007_v300_rbac_migrations.py} | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 awx/main/migrations/0005_v300_active_field_changes.py rename awx/main/migrations/{0003_rbac_changes.py => 0006_v300_rbac_changes.py} (99%) rename awx/main/migrations/{0004_rbac_migrations.py => 0007_v300_rbac_migrations.py} (92%) diff --git a/awx/main/migrations/0005_v300_active_field_changes.py b/awx/main/migrations/0005_v300_active_field_changes.py new file mode 100644 index 0000000000..d7582fc5fb --- /dev/null +++ b/awx/main/migrations/0005_v300_active_field_changes.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from awx.main.migrations import _rbac as rbac +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0004_v300_changes'), + ] + + operations = [ + # This is a placeholder for our future active flag removal work + ] diff --git a/awx/main/migrations/0003_rbac_changes.py b/awx/main/migrations/0006_v300_rbac_changes.py similarity index 99% rename from awx/main/migrations/0003_rbac_changes.py rename to awx/main/migrations/0006_v300_rbac_changes.py index 59468e2325..e85421573f 100644 --- a/awx/main/migrations/0003_rbac_changes.py +++ b/awx/main/migrations/0006_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', '0002_v300_changes'), + ('main', '0005_v300_active_field_changes'), ] operations = [ diff --git a/awx/main/migrations/0004_rbac_migrations.py b/awx/main/migrations/0007_v300_rbac_migrations.py similarity index 92% rename from awx/main/migrations/0004_rbac_migrations.py rename to awx/main/migrations/0007_v300_rbac_migrations.py index 62b90a6783..d50069ab48 100644 --- a/awx/main/migrations/0004_rbac_migrations.py +++ b/awx/main/migrations/0007_v300_rbac_migrations.py @@ -8,7 +8,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('main', '0003_rbac_changes'), + ('main', '0006_v300_rbac_changes'), ] operations = [