From b2066bc4b728e5d2a3b9103eb29aea911a096524 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 5 Oct 2020 11:47:24 -0400
Subject: [PATCH] Merge schema migrations

---
 netbox/circuits/migrations/0021_cablepath.py  |  8 +++
 .../0022_drop_connected_endpoint.py           | 21 -------
 netbox/dcim/migrations/0120_cablepath.py      | 48 +++++++++++++++
 .../0121_drop_connected_endpoint.py           | 61 -------------------
 4 files changed, 56 insertions(+), 82 deletions(-)
 delete mode 100644 netbox/circuits/migrations/0022_drop_connected_endpoint.py
 delete mode 100644 netbox/dcim/migrations/0121_drop_connected_endpoint.py

diff --git a/netbox/circuits/migrations/0021_cablepath.py b/netbox/circuits/migrations/0021_cablepath.py
index fabf71798..b416d2e9f 100644
--- a/netbox/circuits/migrations/0021_cablepath.py
+++ b/netbox/circuits/migrations/0021_cablepath.py
@@ -17,4 +17,12 @@ class Migration(migrations.Migration):
             name='_path',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath'),
         ),
+        migrations.RemoveField(
+            model_name='circuittermination',
+            name='connected_endpoint',
+        ),
+        migrations.RemoveField(
+            model_name='circuittermination',
+            name='connection_status',
+        ),
     ]
diff --git a/netbox/circuits/migrations/0022_drop_connected_endpoint.py b/netbox/circuits/migrations/0022_drop_connected_endpoint.py
deleted file mode 100644
index e5540b44d..000000000
--- a/netbox/circuits/migrations/0022_drop_connected_endpoint.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 3.1 on 2020-10-05 14:07
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('circuits', '0021_cablepath'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='circuittermination',
-            name='connected_endpoint',
-        ),
-        migrations.RemoveField(
-            model_name='circuittermination',
-            name='connection_status',
-        ),
-    ]
diff --git a/netbox/dcim/migrations/0120_cablepath.py b/netbox/dcim/migrations/0120_cablepath.py
index 2b58f119a..dd3c4ed19 100644
--- a/netbox/dcim/migrations/0120_cablepath.py
+++ b/netbox/dcim/migrations/0120_cablepath.py
@@ -58,4 +58,52 @@ class Migration(migrations.Migration):
             name='_path',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath'),
         ),
+        migrations.RemoveField(
+            model_name='consoleport',
+            name='connected_endpoint',
+        ),
+        migrations.RemoveField(
+            model_name='consoleport',
+            name='connection_status',
+        ),
+        migrations.RemoveField(
+            model_name='consoleserverport',
+            name='connection_status',
+        ),
+        migrations.RemoveField(
+            model_name='interface',
+            name='_connected_circuittermination',
+        ),
+        migrations.RemoveField(
+            model_name='interface',
+            name='_connected_interface',
+        ),
+        migrations.RemoveField(
+            model_name='interface',
+            name='connection_status',
+        ),
+        migrations.RemoveField(
+            model_name='powerfeed',
+            name='connected_endpoint',
+        ),
+        migrations.RemoveField(
+            model_name='powerfeed',
+            name='connection_status',
+        ),
+        migrations.RemoveField(
+            model_name='poweroutlet',
+            name='connection_status',
+        ),
+        migrations.RemoveField(
+            model_name='powerport',
+            name='_connected_powerfeed',
+        ),
+        migrations.RemoveField(
+            model_name='powerport',
+            name='_connected_poweroutlet',
+        ),
+        migrations.RemoveField(
+            model_name='powerport',
+            name='connection_status',
+        ),
     ]
diff --git a/netbox/dcim/migrations/0121_drop_connected_endpoint.py b/netbox/dcim/migrations/0121_drop_connected_endpoint.py
deleted file mode 100644
index 9404ecf53..000000000
--- a/netbox/dcim/migrations/0121_drop_connected_endpoint.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# Generated by Django 3.1 on 2020-10-05 14:07
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dcim', '0120_cablepath'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='consoleport',
-            name='connected_endpoint',
-        ),
-        migrations.RemoveField(
-            model_name='consoleport',
-            name='connection_status',
-        ),
-        migrations.RemoveField(
-            model_name='consoleserverport',
-            name='connection_status',
-        ),
-        migrations.RemoveField(
-            model_name='interface',
-            name='_connected_circuittermination',
-        ),
-        migrations.RemoveField(
-            model_name='interface',
-            name='_connected_interface',
-        ),
-        migrations.RemoveField(
-            model_name='interface',
-            name='connection_status',
-        ),
-        migrations.RemoveField(
-            model_name='powerfeed',
-            name='connected_endpoint',
-        ),
-        migrations.RemoveField(
-            model_name='powerfeed',
-            name='connection_status',
-        ),
-        migrations.RemoveField(
-            model_name='poweroutlet',
-            name='connection_status',
-        ),
-        migrations.RemoveField(
-            model_name='powerport',
-            name='_connected_powerfeed',
-        ),
-        migrations.RemoveField(
-            model_name='powerport',
-            name='_connected_poweroutlet',
-        ),
-        migrations.RemoveField(
-            model_name='powerport',
-            name='connection_status',
-        ),
-    ]