[asterisk-commits] mjordan: branch certified-13.1 r430253 - in /certified/branches/13.1: ./ cont...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Tue Jan  6 16:46:26 2015
New Revision: 430253

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=430253
Log:
contrib/ast-db-manage: Correct down_revision path for user_eq_phone

When the user_eq_phone patch was backported to 13, it referenced the downward
revision that the PJSIP optimistic encryption option also references. This
creates a multi-path upgrade Exception when generating the SQL files.

This patch corrects this in the 13 branch. Note that trunk, which already
contained both of these features, is unaffected by this problem.
........

Merged revisions 430252 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    certified/branches/13.1/   (props changed)
    certified/branches/13.1/contrib/ast-db-manage/config/versions/371a3bf4143e_add_user_eq_phone_option_to_pjsip.py

Propchange: certified/branches/13.1/
------------------------------------------------------------------------------
--- branch-13-merged (original)
+++ branch-13-merged Tue Jan  6 16:46:26 2015
@@ -1,1 +1,1 @@
-/branches/13:429128-429222,429224-429246,429352,429407,429409,429433,429477,429497,429519,429540,429571,429739,429741,429761,429829,430010,430034,430083-430084,430092,430200
+/branches/13:429128-429222,429224-429246,429352,429407,429409,429433,429477,429497,429519,429540,429571,429739,429741,429761,429829,430010,430034,430083-430084,430092,430200,430252

Modified: certified/branches/13.1/contrib/ast-db-manage/config/versions/371a3bf4143e_add_user_eq_phone_option_to_pjsip.py
URL: http://svnview.digium.com/svn/asterisk/certified/branches/13.1/contrib/ast-db-manage/config/versions/371a3bf4143e_add_user_eq_phone_option_to_pjsip.py?view=diff&rev=430253&r1=430252&r2=430253
==============================================================================
--- certified/branches/13.1/contrib/ast-db-manage/config/versions/371a3bf4143e_add_user_eq_phone_option_to_pjsip.py (original)
+++ certified/branches/13.1/contrib/ast-db-manage/config/versions/371a3bf4143e_add_user_eq_phone_option_to_pjsip.py Tue Jan  6 16:46:26 2015
@@ -8,7 +8,7 @@
 
 # revision identifiers, used by Alembic.
 revision = '371a3bf4143e'
-down_revision = '10aedae86a32'
+down_revision = 'eb88a14f2a'
 
 from alembic import op
 import sqlalchemy as sa