From a4dcbdf50ff2f0d3928d926c99567e1837ca58b5 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 19 Jan 2016 14:16:17 -0600
Subject: [PATCH] Fix alembic branches on master.
Change-Id: I64ed21fec50eb833641ca49d92184f6aaabd86e8
---
.../versions/136885b81223_add_regcontext_to_pj.py | 4 ++--
...ify_ti.py => 423f34ad36e2_fix_pjsip_qualify_ti.py} | 11 +++++------
2 files changed, 7 insertions(+), 8 deletions(-)
rename contrib/ast-db-manage/config/versions/{3d00be6d0c1f_fix_pjsip_qualify_ti.py => 423f34ad36e2_fix_pjsip_qualify_ti.py} (75%)
diff --git a/contrib/ast-db-manage/config/versions/136885b81223_add_regcontext_to_pj.py b/contrib/ast-db-manage/config/versions/136885b81223_add_regcontext_to_pj.py
index 78accc3229..724a5e5769 100644
--- a/contrib/ast-db-manage/config/versions/136885b81223_add_regcontext_to_pj.py
+++ b/contrib/ast-db-manage/config/versions/136885b81223_add_regcontext_to_pj.py
@@ -1,14 +1,14 @@
"""add regcontext to pjsip
Revision ID: 136885b81223
-Revises: 2d078ec071b7
+Revises: 26d7f3bf0fa5
Create Date: 2016-01-11 22:32:45.470522
"""
# revision identifiers, used by Alembic.
revision = '136885b81223'
-down_revision = '2d078ec071b7'
+down_revision = '26d7f3bf0fa5'
from alembic import op
import sqlalchemy as sa
diff --git a/contrib/ast-db-manage/config/versions/3d00be6d0c1f_fix_pjsip_qualify_ti.py b/contrib/ast-db-manage/config/versions/423f34ad36e2_fix_pjsip_qualify_ti.py
similarity index 75%
rename from contrib/ast-db-manage/config/versions/3d00be6d0c1f_fix_pjsip_qualify_ti.py
rename to contrib/ast-db-manage/config/versions/423f34ad36e2_fix_pjsip_qualify_ti.py
index e0ee399f2c..594f1eb7e0 100644
--- a/contrib/ast-db-manage/config/versions/3d00be6d0c1f_fix_pjsip_qualify_ti.py
+++ b/contrib/ast-db-manage/config/versions/423f34ad36e2_fix_pjsip_qualify_ti.py
@@ -1,14 +1,14 @@
"""fix pjsip qualify timeout
-Revision ID: 3d00be6d0c1f
-Revises: 26d7f3bf0fa5
-Create Date: 2016-01-16 19:48:31.730429
+Revision ID: 423f34ad36e2
+Revises: 136885b81223
+Create Date: 2016-01-13 21:49:21.557734
"""
# revision identifiers, used by Alembic.
-revision = '3d00be6d0c1f'
-down_revision = '26d7f3bf0fa5'
+revision = '423f34ad36e2'
+down_revision = '136885b81223'
from alembic import op
import sqlalchemy as sa
@@ -24,4 +24,3 @@ def downgrade():
op.alter_column('ps_aors', 'qualify_timeout', type_=sa.Integer)
op.alter_column('ps_contacts', 'qualify_timeout', type_=sa.Integer)
pass
-
--
GitLab