[asterisk-commits] rmudgett: branch rmudgett/ss7_27_knk r371169 - in /team/rmudgett/ss7_27_knk: ...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Aug 10 17:39:11 2012
New Revision: 371169

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371169
Log:
Multiple revisions 371144,371147

........
  r371144 | mmichelson | 2012-08-10 16:35:18 -0500 (Fri, 10 Aug 2012) | 24 lines
  
  Fix a couple of documentation problems in app_queue.c
  
  * The RemoveQueueMember app made mention of options that could
  be passed in, but no options are supported. I have removed the
  listing of options from the documentation.
  
  * The RQMSTATUS variable did not list "NOTDYNAMIC" as a possible
  value that could be set.
  
  (closes issue AST-949)
  reported by Steve Pitts
  
  (closes issue AST-954)
  reported by Steve Pitts
  ........
  
  Merged revisions 371141 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 371142 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........
  
  Merged revisions 371143 from http://svn.asterisk.org/svn/asterisk/branches/11
........
  r371147 | rmudgett | 2012-08-10 17:04:32 -0500 (Fri, 10 Aug 2012) | 5 lines
  
  Update CHANGES for private party ID.
  ........
  
  Merged revisions 371146 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 371144,371147 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/rmudgett/ss7_27_knk/   (props changed)
    team/rmudgett/ss7_27_knk/CHANGES
    team/rmudgett/ss7_27_knk/apps/app_queue.c

Propchange: team/rmudgett/ss7_27_knk/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/ss7_27_knk/
------------------------------------------------------------------------------
--- branch-11-merged (original)
+++ branch-11-merged Fri Aug 10 17:39:11 2012
@@ -1,1 +1,1 @@
-/branches/11:1-371121
+/branches/11:1-371121,371143,371146

Propchange: team/rmudgett/ss7_27_knk/
------------------------------------------------------------------------------
--- ss7_27_knk-integrated (original)
+++ ss7_27_knk-integrated Fri Aug 10 17:39:11 2012
@@ -1,1 +1,1 @@
-/trunk:1-371138
+/trunk:1-371168

Modified: team/rmudgett/ss7_27_knk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ss7_27_knk/CHANGES?view=diff&rev=371169&r1=371168&r2=371169
==============================================================================
--- team/rmudgett/ss7_27_knk/CHANGES (original)
+++ team/rmudgett/ss7_27_knk/CHANGES Fri Aug 10 17:39:11 2012
@@ -228,6 +228,10 @@
    to the dialplan. It currently supports returning the current number of
    active sessions for a given account.
 
+ * Added support for private party ID information to CALLERID, CONNECTEDLINE,
+   and the REDIRECTING functions.
+
+
 Channel Drivers
 ------------------
 
@@ -259,6 +263,8 @@
 
  * Added several SS7 config option parameters described in
    chan_dahdi.conf.sample.
+
+ * Added support to use private party ID information with PRI calls.
 
 
 chan_motif
@@ -364,6 +370,9 @@
  * Extra headers specified with SIPAddHeader are sent with the REFER message
    when using Transfer application. See refer_addheaders in sip.conf.sample.
 
+ * Added support to use private party ID information with calls.
+
+
 chan_skinny
 ------------------
  * Added skinny version 17 protocol support.
@@ -400,6 +409,8 @@
 ------------------
  * Add options namedcallgroup and namedpickupgroup to support installations
    where a higher number of groups (>64) is required.
+
+ * Added support to use private party ID information with calls.
 
 
 Core
@@ -439,6 +450,9 @@
 
  * Call files now support the "early_media" option to connect with an outgoing
    extension when early media is received.
+
+ * Added support to use private party ID information with calls.
+
 
 AGI
 ------------------

Modified: team/rmudgett/ss7_27_knk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ss7_27_knk/apps/app_queue.c?view=diff&rev=371169&r1=371168&r2=371169
==============================================================================
--- team/rmudgett/ss7_27_knk/apps/app_queue.c (original)
+++ team/rmudgett/ss7_27_knk/apps/app_queue.c Fri Aug 10 17:39:11 2012
@@ -326,7 +326,6 @@
 		<syntax>
 			<parameter name="queuename" required="true" />
 			<parameter name="interface" />
-			<parameter name="options" />
 		</syntax>
 		<description>
 			<para>If the interface is <emphasis>NOT</emphasis> in the queue it will return an error.</para>
@@ -336,6 +335,7 @@
 					<value name="REMOVED" />
 					<value name="NOTINQUEUE" />
 					<value name="NOSUCHQUEUE" />
+					<value name="NOTDYNAMIC" />
 				</variable>
 			</variablelist>
 			<para>Example: RemoveQueueMember(techsupport,SIP/3000)</para>
@@ -6414,12 +6414,11 @@
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(queuename);
 		AST_APP_ARG(interface);
-		AST_APP_ARG(options);
 	);
 
 
 	if (ast_strlen_zero(data)) {
-		ast_log(LOG_WARNING, "RemoveQueueMember requires an argument (queuename[,interface[,options]])\n");
+		ast_log(LOG_WARNING, "RemoveQueueMember requires an argument (queuename[,interface])\n");
 		return -1;
 	}