Fix alembic branches on master.
authorRichard Mudgett <rmudgett@digium.com>
Tue, 19 Jan 2016 20:16:17 +0000 (14:16 -0600)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 19 Jan 2016 20:16:17 +0000 (14:16 -0600)
Change-Id: I64ed21fec50eb833641ca49d92184f6aaabd86e8

contrib/ast-db-manage/config/versions/136885b81223_add_regcontext_to_pj.py
contrib/ast-db-manage/config/versions/423f34ad36e2_fix_pjsip_qualify_ti.py [moved from contrib/ast-db-manage/config/versions/3d00be6d0c1f_fix_pjsip_qualify_ti.py with 75% similarity]

index 78accc3..724a5e5 100644 (file)
@@ -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
@@ -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
-