[asterisk-commits] seanbright: trunk r302418 - in /trunk: ./ configs/extensions.conf.sample

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Jan 19 09:54:22 2011
New Revision: 302418

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302418
Log:
Merged revisions 302417 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302417 | seanbright | 2011-01-19 10:53:20 -0500 (Wed, 19 Jan 2011) | 16 lines
  
  Merged revisions 302416 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r302416 | seanbright | 2011-01-19 10:52:44 -0500 (Wed, 19 Jan 2011) | 9 lines
    
    Remove references to priorityjumping from the sample extensions.conf.
    
    Priority jumping was removed from pbx_config in r68970.
    
    (closes issue #18622)
    Reported by: kshumard
    Patches:
          extensions.conf.sample.patch uploaded by kshumard (license 92)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/configs/extensions.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/extensions.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/extensions.conf.sample?view=diff&rev=302418&r1=302417&r2=302418
==============================================================================
--- trunk/configs/extensions.conf.sample (original)
+++ trunk/configs/extensions.conf.sample Wed Jan 19 09:54:22 2011
@@ -87,14 +87,6 @@
 ; they are not stored in the extensions.conf file.
 ;
 clearglobalvars=no
-;
-; If priorityjumping is set to 'yes', then applications that support
-; 'jumping' to a different priority based on the result of their operations
-; will do so (this is backwards compatible behavior with pre-1.2 releases
-; of Asterisk). Individual applications can also be requested to do this
-; by passing a 'j' option in their arguments.
-;
-;priorityjumping=yes
 ;
 ; User context is where entries from users.conf are registered.  The
 ; default value is 'default'