shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

Merge pull request #516 from AlanCoding/abc_migrations

Browse Source 
Fix 3.1.1->3.2.1 migration error
This commit is contained in:
Alan Rominger 2017-10-09 16:37:35 -04:00 committed by GitHub
commit 7365e4a63f
4 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/migrations/0005_squashed_v310_v313_updates.py
View File

@ -12,7 +12,6 @@ class Migration(migrations.Migration):
replaces = [
(b'main', '0035_v310_remove_tower_settings'),
(b'main', '0036_v311_insights'),
]
operations = [

18
awx/main/migrations/0005a_squashed_v310_v313_updates.py
View File

@ -11,14 +11,18 @@ class Migration(migrations.Migration):
]
replaces = [
(b'main', '0037_v313_instance_version'),
(b'main', '0036_v311_insights'),
]
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),
migrations.AlterField(
model_name='project',
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.AlterField(
model_name='projectupdate',
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'),
),
]

24
awx/main/migrations/0005b_squashed_v310_v313_updates.py Normal file
View File

@ -0,0 +1,24 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0005a_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),
),
]

2
awx/main/migrations/0006_v320_release.py
View File

@ -18,7 +18,7 @@ from awx.main.models import Host
class Migration(migrations.Migration):
dependencies = [
('main', '0005a_squashed_v310_v313_updates'),
('main', '0005b_squashed_v310_v313_updates'),
]
operations = [