From 77dc70141ecc88a80603ea499d2735a887945761 Mon Sep 17 00:00:00 2001 From: hellerve Date: Tue, 6 Aug 2019 20:17:22 +0200 Subject: [PATCH] all: rebase migrations on develop --- ...ts.py => 0016_modernize_unique_constraints.py} | 4 ++-- ...ts.py => 0074_modernize_unique_constraints.py} | 15 ++------------- ...ts.py => 0024_modernize_unique_constraints.py} | 4 ++-- ...ts.py => 0028_modernize_unique_constraints.py} | 4 ++-- ...ts.py => 0007_modernize_unique_constraints.py} | 4 ++-- 5 files changed, 10 insertions(+), 21 deletions(-) rename netbox/circuits/migrations/{0015_modernize_unique_constraints.py => 0016_modernize_unique_constraints.py} (87%) rename netbox/dcim/migrations/{0070_modernize_unique_constraints.py => 0074_modernize_unique_constraints.py} (90%) rename netbox/extras/migrations/{0019_modernize_unique_constraints.py => 0024_modernize_unique_constraints.py} (93%) rename netbox/ipam/migrations/{0025_modernize_unique_constraints.py => 0028_modernize_unique_constraints.py} (91%) rename netbox/secrets/migrations/{0006_modernize_unique_constraints.py => 0007_modernize_unique_constraints.py} (82%) diff --git a/netbox/circuits/migrations/0015_modernize_unique_constraints.py b/netbox/circuits/migrations/0016_modernize_unique_constraints.py similarity index 87% rename from netbox/circuits/migrations/0015_modernize_unique_constraints.py rename to netbox/circuits/migrations/0016_modernize_unique_constraints.py index 873c12b93..1265d1ef7 100644 --- a/netbox/circuits/migrations/0015_modernize_unique_constraints.py +++ b/netbox/circuits/migrations/0016_modernize_unique_constraints.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.4 on 2019-08-06 15:52 +# Generated by Django 2.2.4 on 2019-08-06 18:16 from django.db import migrations, models @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('circuits', '0014_circuittermination_description'), + ('circuits', '0015_custom_tag_models'), ] operations = [ diff --git a/netbox/dcim/migrations/0070_modernize_unique_constraints.py b/netbox/dcim/migrations/0074_modernize_unique_constraints.py similarity index 90% rename from netbox/dcim/migrations/0070_modernize_unique_constraints.py rename to netbox/dcim/migrations/0074_modernize_unique_constraints.py index 11524edaa..0adaa1d68 100644 --- a/netbox/dcim/migrations/0070_modernize_unique_constraints.py +++ b/netbox/dcim/migrations/0074_modernize_unique_constraints.py @@ -1,26 +1,15 @@ -# Generated by Django 2.2.4 on 2019-08-06 15:52 +# Generated by Django 2.2.4 on 2019-08-06 18:16 from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('dcim', '0069_deprecate_nullablecharfield'), + ('dcim', '0073_interface_form_factor_to_type'), ] operations = [ - migrations.AlterField( - model_name='cable', - name='termination_a_type', - field=models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport', 'circuittermination']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'), - ), - migrations.AlterField( - model_name='cable', - name='termination_b_type', - field=models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport', 'circuittermination']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'), - ), migrations.AlterUniqueTogether( name='cable', unique_together=set(), diff --git a/netbox/extras/migrations/0019_modernize_unique_constraints.py b/netbox/extras/migrations/0024_modernize_unique_constraints.py similarity index 93% rename from netbox/extras/migrations/0019_modernize_unique_constraints.py rename to netbox/extras/migrations/0024_modernize_unique_constraints.py index ea169dab5..126cb12a0 100644 --- a/netbox/extras/migrations/0019_modernize_unique_constraints.py +++ b/netbox/extras/migrations/0024_modernize_unique_constraints.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.4 on 2019-08-06 15:52 +# Generated by Django 2.2.4 on 2019-08-06 18:16 from django.db import migrations, models @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('extras', '0018_exporttemplate_add_jinja2'), + ('extras', '0023_fix_tag_sequences'), ] operations = [ diff --git a/netbox/ipam/migrations/0025_modernize_unique_constraints.py b/netbox/ipam/migrations/0028_modernize_unique_constraints.py similarity index 91% rename from netbox/ipam/migrations/0025_modernize_unique_constraints.py rename to netbox/ipam/migrations/0028_modernize_unique_constraints.py index 5d607beaa..cbbc98f4a 100644 --- a/netbox/ipam/migrations/0025_modernize_unique_constraints.py +++ b/netbox/ipam/migrations/0028_modernize_unique_constraints.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.4 on 2019-08-06 15:52 +# Generated by Django 2.2.4 on 2019-08-06 18:16 from django.db import migrations, models @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('ipam', '0024_vrf_allow_null_rd'), + ('ipam', '0027_ipaddress_add_dns_name'), ] operations = [ diff --git a/netbox/secrets/migrations/0006_modernize_unique_constraints.py b/netbox/secrets/migrations/0007_modernize_unique_constraints.py similarity index 82% rename from netbox/secrets/migrations/0006_modernize_unique_constraints.py rename to netbox/secrets/migrations/0007_modernize_unique_constraints.py index d8519ae0c..4ec0adf76 100644 --- a/netbox/secrets/migrations/0006_modernize_unique_constraints.py +++ b/netbox/secrets/migrations/0007_modernize_unique_constraints.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.4 on 2019-08-06 15:52 +# Generated by Django 2.2.4 on 2019-08-06 18:16 from django.db import migrations, models @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('secrets', '0005_change_logging'), + ('secrets', '0006_custom_tag_models'), ] operations = [