From 51296bb6bb29622870840a63adc7c9d3f7fc0077 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Mon, 21 Oct 2024 11:54:06 -0700 Subject: [PATCH] 9604 fix migration merge --- ...ttermination__scope.py => 0047_circuittermination__scope.py} | 2 +- ...elations.py => 0048_circuitterminations_cached_relations.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename netbox/circuits/migrations/{0046_circuittermination__scope.py => 0047_circuittermination__scope.py} (96%) rename netbox/circuits/migrations/{0047_circuitterminations_cached_relations.py => 0048_circuitterminations_cached_relations.py} (97%) diff --git a/netbox/circuits/migrations/0046_circuittermination__scope.py b/netbox/circuits/migrations/0047_circuittermination__scope.py similarity index 96% rename from netbox/circuits/migrations/0046_circuittermination__scope.py rename to netbox/circuits/migrations/0047_circuittermination__scope.py index 482ba1f47..8c87f397e 100644 --- a/netbox/circuits/migrations/0046_circuittermination__scope.py +++ b/netbox/circuits/migrations/0047_circuittermination__scope.py @@ -19,7 +19,7 @@ def copy_site_assignments(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('circuits', '0045_circuit_distance'), + ('circuits', '0046_charfield_null_choices'), ('contenttypes', '0002_remove_content_type_name'), ('dcim', '0193_poweroutlet_color'), ] diff --git a/netbox/circuits/migrations/0047_circuitterminations_cached_relations.py b/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py similarity index 97% rename from netbox/circuits/migrations/0047_circuitterminations_cached_relations.py rename to netbox/circuits/migrations/0048_circuitterminations_cached_relations.py index 9baa36f23..31b61c8ca 100644 --- a/netbox/circuits/migrations/0047_circuitterminations_cached_relations.py +++ b/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py @@ -22,7 +22,7 @@ def populate_denormalized_fields(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('circuits', '0046_circuittermination__scope'), + ('circuits', '0047_circuittermination__scope'), ] operations = [