[asterisk-commits] kmoore: branch kmoore/pjsip_path_support r405003 - in /team/kmoore/pjsip_path...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Mon Jan  6 15:44:21 2014
New Revision: 405003

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405003
Log:
Update and re-enable automerge

Added:
    team/kmoore/pjsip_path_support/include/asterisk/res_mwi_external.h
      - copied unchanged from r404955, trunk/include/asterisk/res_mwi_external.h
    team/kmoore/pjsip_path_support/res/res_mwi_external.c
      - copied unchanged from r404955, trunk/res/res_mwi_external.c
    team/kmoore/pjsip_path_support/res/res_mwi_external.exports.in
      - copied unchanged from r404955, trunk/res/res_mwi_external.exports.in
    team/kmoore/pjsip_path_support/res/res_mwi_external_ami.c
      - copied unchanged from r404955, trunk/res/res_mwi_external_ami.c
Modified:
    team/kmoore/pjsip_path_support/   (props changed)
    team/kmoore/pjsip_path_support/apps/app_voicemail.c
    team/kmoore/pjsip_path_support/configs/sorcery.conf.sample

Propchange: team/kmoore/pjsip_path_support/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/kmoore/pjsip_path_support/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Mon Jan  6 15:44:21 2014
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403778,403781-404568,404581,404592,404605,404613,404652,404663,404676,404725,404737,404764,404781,404786,404843,404855,404859,404911,404923,404935
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403778,403781-404568,404581,404592,404605,404613,404652,404663,404676,404725,404737,404764,404781,404786,404843,404855,404859,404911,404923,404935,404952,404954

Propchange: team/kmoore/pjsip_path_support/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan  6 15:44:21 2014
@@ -1,1 +1,1 @@
-/trunk:1-404947
+/trunk:1-405002

Modified: team/kmoore/pjsip_path_support/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_path_support/apps/app_voicemail.c?view=diff&rev=405003&r1=405002&r2=405003
==============================================================================
--- team/kmoore/pjsip_path_support/apps/app_voicemail.c (original)
+++ team/kmoore/pjsip_path_support/apps/app_voicemail.c Mon Jan  6 15:44:21 2014
@@ -47,6 +47,7 @@
  */
 
 /*** MODULEINFO
+	<conflict>res_mwi_external</conflict>
 	<use type="module">res_adsi</use>
 	<use type="module">res_smdi</use>
 	<support_level>core</support_level>

Modified: team/kmoore/pjsip_path_support/configs/sorcery.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_path_support/configs/sorcery.conf.sample?view=diff&rev=405003&r1=405002&r2=405003
==============================================================================
--- team/kmoore/pjsip_path_support/configs/sorcery.conf.sample (original)
+++ team/kmoore/pjsip_path_support/configs/sorcery.conf.sample Mon Jan  6 15:44:21 2014
@@ -49,6 +49,13 @@
 test=memory
 
 ;
+; The following object mapping is the default mapping of external MWI mailbox
+; objects to give persistence to the message counts.
+;
+;[res_mwi_external]
+;mailboxes=astdb,mwi_external
+
+;
 ; The following object mappings set PJSIP objects to use realtime database mappings from extconfig
 ; with the table names used when automatically generating configuration from the alembic script.
 ;