From a1de3535436a551843a86487c7920e46fde89d60 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 1 Nov 2016 14:39:35 -0400 Subject: [PATCH] Shifting migrations after 3.0.3 merge --- awx/conf/migrations/0002_v310_copy_tower_settings.py | 4 ++-- ...{0033_v310_add_workflows.py => 0034_v310_add_workflows.py} | 2 +- ..._modify_ha_instance.py => 0035_v310_modify_ha_instance.py} | 2 +- ...{0035_v310_jobevent_uuid.py => 0036_v310_jobevent_uuid.py} | 2 +- ...e_tower_settings.py => 0037_v310_remove_tower_settings.py} | 2 +- ...ow_simultaneous.py => 0038_v310_job_allow_simultaneous.py} | 2 +- ...low_rbac_prompts.py => 0039_v310_workflow_rbac_prompts.py} | 2 +- .../{0039_v310_channelgroup.py => 0040_v310_channelgroup.py} | 2 +- .../{0040_v310_artifacts.py => 0041_v310_artifacts.py} | 2 +- .../{0041_v310_job_timeout.py => 0042_v310_job_timeout.py} | 2 +- ...{0042_v310_executionnode.py => 0043_v310_executionnode.py} | 2 +- .../{0043_v310_scm_revision.py => 0044_v310_scm_revision.py} | 2 +- ..._playbook_files.py => 0045_v310_project_playbook_files.py} | 2 +- ...v310_job_event_stdout.py => 0046_v310_job_event_stdout.py} | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) rename awx/main/migrations/{0033_v310_add_workflows.py => 0034_v310_add_workflows.py} (98%) rename awx/main/migrations/{0034_v310_modify_ha_instance.py => 0035_v310_modify_ha_instance.py} (91%) rename awx/main/migrations/{0035_v310_jobevent_uuid.py => 0036_v310_jobevent_uuid.py} (88%) rename awx/main/migrations/{0036_v310_remove_tower_settings.py => 0037_v310_remove_tower_settings.py} (90%) rename awx/main/migrations/{0037_v310_job_allow_simultaneous.py => 0038_v310_job_allow_simultaneous.py} (87%) rename awx/main/migrations/{0038_v310_workflow_rbac_prompts.py => 0039_v310_workflow_rbac_prompts.py} (98%) rename awx/main/migrations/{0039_v310_channelgroup.py => 0040_v310_channelgroup.py} (91%) rename awx/main/migrations/{0040_v310_artifacts.py => 0041_v310_artifacts.py} (93%) rename awx/main/migrations/{0041_v310_job_timeout.py => 0042_v310_job_timeout.py} (96%) rename awx/main/migrations/{0042_v310_executionnode.py => 0043_v310_executionnode.py} (90%) rename awx/main/migrations/{0043_v310_scm_revision.py => 0044_v310_scm_revision.py} (95%) rename awx/main/migrations/{0044_v310_project_playbook_files.py => 0045_v310_project_playbook_files.py} (91%) rename awx/main/migrations/{0045_v310_job_event_stdout.py => 0046_v310_job_event_stdout.py} (98%) diff --git a/awx/conf/migrations/0002_v310_copy_tower_settings.py b/awx/conf/migrations/0002_v310_copy_tower_settings.py index 2ab255debb..2fbdd60477 100644 --- a/awx/conf/migrations/0002_v310_copy_tower_settings.py +++ b/awx/conf/migrations/0002_v310_copy_tower_settings.py @@ -69,11 +69,11 @@ class Migration(migrations.Migration): dependencies = [ ('conf', '0001_initial'), - ('main', '0035_v310_jobevent_uuid'), + ('main', '0036_v310_jobevent_uuid'), ] run_before = [ - ('main', '0036_v310_remove_tower_settings'), + ('main', '0037_v310_remove_tower_settings'), ] operations = [ diff --git a/awx/main/migrations/0033_v310_add_workflows.py b/awx/main/migrations/0034_v310_add_workflows.py similarity index 98% rename from awx/main/migrations/0033_v310_add_workflows.py rename to awx/main/migrations/0034_v310_add_workflows.py index 1ca0462edf..ceaf091cad 100644 --- a/awx/main/migrations/0033_v310_add_workflows.py +++ b/awx/main/migrations/0034_v310_add_workflows.py @@ -11,7 +11,7 @@ import awx.main.fields class Migration(migrations.Migration): dependencies = [ - ('main', '0032_v302_credential_permissions_update'), + ('main', '0033_v303_v245_host_variable_fix'), ] operations = [ diff --git a/awx/main/migrations/0034_v310_modify_ha_instance.py b/awx/main/migrations/0035_v310_modify_ha_instance.py similarity index 91% rename from awx/main/migrations/0034_v310_modify_ha_instance.py rename to awx/main/migrations/0035_v310_modify_ha_instance.py index ad245ca4b4..fa58ec094c 100644 --- a/awx/main/migrations/0034_v310_modify_ha_instance.py +++ b/awx/main/migrations/0035_v310_modify_ha_instance.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0033_v310_add_workflows'), + ('main', '0034_v310_add_workflows'), ] operations = [ diff --git a/awx/main/migrations/0035_v310_jobevent_uuid.py b/awx/main/migrations/0036_v310_jobevent_uuid.py similarity index 88% rename from awx/main/migrations/0035_v310_jobevent_uuid.py rename to awx/main/migrations/0036_v310_jobevent_uuid.py index bd667792e7..b097c2d1f1 100644 --- a/awx/main/migrations/0035_v310_jobevent_uuid.py +++ b/awx/main/migrations/0036_v310_jobevent_uuid.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0034_v310_modify_ha_instance'), + ('main', '0035_v310_modify_ha_instance'), ] operations = [ diff --git a/awx/main/migrations/0036_v310_remove_tower_settings.py b/awx/main/migrations/0037_v310_remove_tower_settings.py similarity index 90% rename from awx/main/migrations/0036_v310_remove_tower_settings.py rename to awx/main/migrations/0037_v310_remove_tower_settings.py index a5a75b12ca..00ee17f098 100644 --- a/awx/main/migrations/0036_v310_remove_tower_settings.py +++ b/awx/main/migrations/0037_v310_remove_tower_settings.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0035_v310_jobevent_uuid'), + ('main', '0036_v310_jobevent_uuid'), ] # These settings are now in the separate awx.conf app. diff --git a/awx/main/migrations/0037_v310_job_allow_simultaneous.py b/awx/main/migrations/0038_v310_job_allow_simultaneous.py similarity index 87% rename from awx/main/migrations/0037_v310_job_allow_simultaneous.py rename to awx/main/migrations/0038_v310_job_allow_simultaneous.py index 8a2e89df94..1ec3412fb4 100644 --- a/awx/main/migrations/0037_v310_job_allow_simultaneous.py +++ b/awx/main/migrations/0038_v310_job_allow_simultaneous.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0036_v310_remove_tower_settings'), + ('main', '0037_v310_remove_tower_settings'), ] operations = [ diff --git a/awx/main/migrations/0038_v310_workflow_rbac_prompts.py b/awx/main/migrations/0039_v310_workflow_rbac_prompts.py similarity index 98% rename from awx/main/migrations/0038_v310_workflow_rbac_prompts.py rename to awx/main/migrations/0039_v310_workflow_rbac_prompts.py index 6fa55f8469..35db9c5575 100644 --- a/awx/main/migrations/0038_v310_workflow_rbac_prompts.py +++ b/awx/main/migrations/0039_v310_workflow_rbac_prompts.py @@ -10,7 +10,7 @@ import awx.main.fields class Migration(migrations.Migration): dependencies = [ - ('main', '0037_v310_job_allow_simultaneous'), + ('main', '0038_v310_job_allow_simultaneous'), ] operations = [ diff --git a/awx/main/migrations/0039_v310_channelgroup.py b/awx/main/migrations/0040_v310_channelgroup.py similarity index 91% rename from awx/main/migrations/0039_v310_channelgroup.py rename to awx/main/migrations/0040_v310_channelgroup.py index a150f4cf29..51f2016926 100644 --- a/awx/main/migrations/0039_v310_channelgroup.py +++ b/awx/main/migrations/0040_v310_channelgroup.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0038_v310_workflow_rbac_prompts'), + ('main', '0039_v310_workflow_rbac_prompts'), ] operations = [ diff --git a/awx/main/migrations/0040_v310_artifacts.py b/awx/main/migrations/0041_v310_artifacts.py similarity index 93% rename from awx/main/migrations/0040_v310_artifacts.py rename to awx/main/migrations/0041_v310_artifacts.py index af1c66f485..f54cff411b 100644 --- a/awx/main/migrations/0040_v310_artifacts.py +++ b/awx/main/migrations/0041_v310_artifacts.py @@ -8,7 +8,7 @@ import jsonfield.fields class Migration(migrations.Migration): dependencies = [ - ('main', '0039_v310_channelgroup'), + ('main', '0040_v310_channelgroup'), ] operations = [ diff --git a/awx/main/migrations/0041_v310_job_timeout.py b/awx/main/migrations/0042_v310_job_timeout.py similarity index 96% rename from awx/main/migrations/0041_v310_job_timeout.py rename to awx/main/migrations/0042_v310_job_timeout.py index 447ed6d38b..4d49e5841a 100644 --- a/awx/main/migrations/0041_v310_job_timeout.py +++ b/awx/main/migrations/0042_v310_job_timeout.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0040_v310_artifacts'), + ('main', '0041_v310_artifacts'), ] operations = [ diff --git a/awx/main/migrations/0042_v310_executionnode.py b/awx/main/migrations/0043_v310_executionnode.py similarity index 90% rename from awx/main/migrations/0042_v310_executionnode.py rename to awx/main/migrations/0043_v310_executionnode.py index f696d4b95d..bab47ad032 100644 --- a/awx/main/migrations/0042_v310_executionnode.py +++ b/awx/main/migrations/0043_v310_executionnode.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0041_v310_job_timeout'), + ('main', '0042_v310_job_timeout'), ] operations = [ diff --git a/awx/main/migrations/0043_v310_scm_revision.py b/awx/main/migrations/0044_v310_scm_revision.py similarity index 95% rename from awx/main/migrations/0043_v310_scm_revision.py rename to awx/main/migrations/0044_v310_scm_revision.py index 08db6be47e..40ee1f8596 100644 --- a/awx/main/migrations/0043_v310_scm_revision.py +++ b/awx/main/migrations/0044_v310_scm_revision.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0042_v310_executionnode'), + ('main', '0043_v310_executionnode'), ] operations = [ diff --git a/awx/main/migrations/0044_v310_project_playbook_files.py b/awx/main/migrations/0045_v310_project_playbook_files.py similarity index 91% rename from awx/main/migrations/0044_v310_project_playbook_files.py rename to awx/main/migrations/0045_v310_project_playbook_files.py index cdf059faec..77c7bfc8b7 100644 --- a/awx/main/migrations/0044_v310_project_playbook_files.py +++ b/awx/main/migrations/0045_v310_project_playbook_files.py @@ -8,7 +8,7 @@ import jsonfield.fields class Migration(migrations.Migration): dependencies = [ - ('main', '0043_v310_scm_revision'), + ('main', '0044_v310_scm_revision'), ] operations = [ diff --git a/awx/main/migrations/0045_v310_job_event_stdout.py b/awx/main/migrations/0046_v310_job_event_stdout.py similarity index 98% rename from awx/main/migrations/0045_v310_job_event_stdout.py rename to awx/main/migrations/0046_v310_job_event_stdout.py index e3325ddb6b..7ff2ed8ade 100644 --- a/awx/main/migrations/0045_v310_job_event_stdout.py +++ b/awx/main/migrations/0046_v310_job_event_stdout.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0044_v310_project_playbook_files'), + ('main', '0045_v310_project_playbook_files'), ] operations = [