From 20c579a152da9f50bf68466d24fd40345089ce64 Mon Sep 17 00:00:00 2001 From: Jason Novinger Date: Fri, 10 Apr 2026 13:57:27 -0500 Subject: [PATCH] Renumber permission migrations after feature merge Resolve migration conflicts with default_ordering_indexes migrations. Renumber to 0023 (core), 0232 (dcim), 0056 (virtualization) and update dependencies. --- ...ce_sync_permission.py => 0023_datasource_sync_permission.py} | 2 +- ...ig_permission.py => 0232_device_render_config_permission.py} | 2 +- ...ssion.py => 0056_virtualmachine_render_config_permission.py} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename netbox/core/migrations/{0022_datasource_sync_permission.py => 0023_datasource_sync_permission.py} (87%) rename netbox/dcim/migrations/{0231_device_render_config_permission.py => 0232_device_render_config_permission.py} (84%) rename netbox/virtualization/migrations/{0055_virtualmachine_render_config_permission.py => 0056_virtualmachine_render_config_permission.py} (85%) diff --git a/netbox/core/migrations/0022_datasource_sync_permission.py b/netbox/core/migrations/0023_datasource_sync_permission.py similarity index 87% rename from netbox/core/migrations/0022_datasource_sync_permission.py rename to netbox/core/migrations/0023_datasource_sync_permission.py index 5985fadbb..8e0ce214a 100644 --- a/netbox/core/migrations/0022_datasource_sync_permission.py +++ b/netbox/core/migrations/0023_datasource_sync_permission.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('core', '0021_job_queue_name'), + ('core', '0022_default_ordering_indexes'), ] operations = [ diff --git a/netbox/dcim/migrations/0231_device_render_config_permission.py b/netbox/dcim/migrations/0232_device_render_config_permission.py similarity index 84% rename from netbox/dcim/migrations/0231_device_render_config_permission.py rename to netbox/dcim/migrations/0232_device_render_config_permission.py index 0e776d5c4..862e5ec21 100644 --- a/netbox/dcim/migrations/0231_device_render_config_permission.py +++ b/netbox/dcim/migrations/0232_device_render_config_permission.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('dcim', '0230_interface_rf_channel_frequency_precision'), + ('dcim', '0231_default_ordering_indexes'), ] operations = [ diff --git a/netbox/virtualization/migrations/0055_virtualmachine_render_config_permission.py b/netbox/virtualization/migrations/0056_virtualmachine_render_config_permission.py similarity index 85% rename from netbox/virtualization/migrations/0055_virtualmachine_render_config_permission.py rename to netbox/virtualization/migrations/0056_virtualmachine_render_config_permission.py index 33d538bcd..70ee520a6 100644 --- a/netbox/virtualization/migrations/0055_virtualmachine_render_config_permission.py +++ b/netbox/virtualization/migrations/0056_virtualmachine_render_config_permission.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('virtualization', '0054_virtualmachinetype'), + ('virtualization', '0055_default_ordering_indexes'), ] operations = [