all: rebase migrations on develop

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 = [

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(),

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 = [

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 = [

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 = [