From 8c0383c82aa313c08eef15d96052513dce8b1db2 Mon Sep 17 00:00:00 2001 From: BoKeum Date: Thu, 23 Jul 2026 22:17:50 +0900 Subject: [PATCH 1/2] fix(alembic): merge diverged migration heads --- ...5ee0d8eed_merge_heads_339ae21cb8ec_and_.py | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/ai/backend/manager/models/alembic/versions/5405ee0d8eed_merge_heads_339ae21cb8ec_and_.py diff --git a/src/ai/backend/manager/models/alembic/versions/5405ee0d8eed_merge_heads_339ae21cb8ec_and_.py b/src/ai/backend/manager/models/alembic/versions/5405ee0d8eed_merge_heads_339ae21cb8ec_and_.py new file mode 100644 index 00000000000..3e3e01a0b1d --- /dev/null +++ b/src/ai/backend/manager/models/alembic/versions/5405ee0d8eed_merge_heads_339ae21cb8ec_and_.py @@ -0,0 +1,22 @@ +"""merge heads 339ae21cb8ec and 39fadbbea696 + +Revision ID: 5405ee0d8eed +Revises: 339ae21cb8ec, 39fadbbea696 +Create Date: 2026-07-23 22:14:46.696886 + +""" + +# revision identifiers, used by Alembic. +revision = "5405ee0d8eed" +down_revision = ("339ae21cb8ec", "39fadbbea696") +# Part of: NEXT_RELEASE_VERSION +branch_labels = None +depends_on = None + + +def upgrade() -> None: + pass + + +def downgrade() -> None: + pass From e267775f3ec3775b85ba5fdd2f88cd0e50db54a8 Mon Sep 17 00:00:00 2001 From: BoKeum Date: Thu, 23 Jul 2026 22:20:28 +0900 Subject: [PATCH 2/2] changelog: add news fragment for PR #13094 --- changes/13094.misc.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/13094.misc.md diff --git a/changes/13094.misc.md b/changes/13094.misc.md new file mode 100644 index 00000000000..317c2b4c77d --- /dev/null +++ b/changes/13094.misc.md @@ -0,0 +1 @@ +Merge diverged manager Alembic migration heads.