diff --git a/awx/main/migrations/0005_squashed_v310_v313_updates.py b/awx/main/migrations/0005_squashed_v310_v313_updates.py index 24a7f2d207..e948a1a9e2 100644 --- a/awx/main/migrations/0005_squashed_v310_v313_updates.py +++ b/awx/main/migrations/0005_squashed_v310_v313_updates.py @@ -13,7 +13,6 @@ class Migration(migrations.Migration): replaces = [ (b'main', '0035_v310_remove_tower_settings'), (b'main', '0036_v311_insights'), - (b'main', '0037_v313_instance_version'), ] operations = [ @@ -36,11 +35,4 @@ class Migration(migrations.Migration): name='scm_type', field=models.CharField(default=b'', choices=[(b'', 'Manual'), (b'git', 'Git'), (b'hg', 'Mercurial'), (b'svn', 'Subversion'), (b'insights', 'Red Hat Insights')], max_length=8, blank=True, help_text='Specifies the source control system used to store the project.', verbose_name='SCM Type'), ), - - migrations.AddField( - model_name='instance', - name='version', - field=models.CharField(max_length=24, blank=True), - ), - ] diff --git a/awx/main/migrations/0005a_squashed_v310_v313_updates.py b/awx/main/migrations/0005a_squashed_v310_v313_updates.py new file mode 100644 index 0000000000..0a8684f097 --- /dev/null +++ b/awx/main/migrations/0005a_squashed_v310_v313_updates.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0005_squashed_v310_v313_updates'), + ] + + replaces = [ + (b'main', '0037_v313_instance_version'), + ] + + operations = [ + # Remove Tower settings, these settings are now in separate awx.conf app. + migrations.AddField( + model_name='instance', + name='version', + field=models.CharField(max_length=24, blank=True), + ), + ] diff --git a/awx/main/migrations/0006_v320_release.py b/awx/main/migrations/0006_v320_release.py index 45eabbebc5..e526a5c762 100644 --- a/awx/main/migrations/0006_v320_release.py +++ b/awx/main/migrations/0006_v320_release.py @@ -18,7 +18,7 @@ from awx.main.models import Host class Migration(migrations.Migration): dependencies = [ - ('main', '0005_squashed_v310_v313_updates'), + ('main', '0005a_squashed_v310_v313_updates'), ] operations = [