From f1ee963bd08f361e6db14b44c768dd1b30c3a9fe Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 18 Mar 2020 16:19:04 -0400 Subject: [PATCH] fix up rebased migrations --- ..._instance_ip_address.py => 0110_v370_instance_ip_address.py} | 2 +- ..._delete_channelgroup.py => 0111_v370_delete_channelgroup.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename awx/main/migrations/{0109_v370_instance_ip_address.py => 0110_v370_instance_ip_address.py} (85%) rename awx/main/migrations/{0110_delete_channelgroup.py => 0111_v370_delete_channelgroup.py} (83%) diff --git a/awx/main/migrations/0109_v370_instance_ip_address.py b/awx/main/migrations/0110_v370_instance_ip_address.py similarity index 85% rename from awx/main/migrations/0109_v370_instance_ip_address.py rename to awx/main/migrations/0110_v370_instance_ip_address.py index f3c97d5cff..914be02c52 100644 --- a/awx/main/migrations/0109_v370_instance_ip_address.py +++ b/awx/main/migrations/0110_v370_instance_ip_address.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0108_v370_unifiedjob_dependencies_processed'), + ('main', '0109_v370_job_template_organization_field'), ] operations = [ diff --git a/awx/main/migrations/0110_delete_channelgroup.py b/awx/main/migrations/0111_v370_delete_channelgroup.py similarity index 83% rename from awx/main/migrations/0110_delete_channelgroup.py rename to awx/main/migrations/0111_v370_delete_channelgroup.py index 7f571e587a..d17270fb90 100644 --- a/awx/main/migrations/0110_delete_channelgroup.py +++ b/awx/main/migrations/0111_v370_delete_channelgroup.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('main', '0109_v370_instance_ip_address'), + ('main', '0110_v370_instance_ip_address'), ] operations = [