[svn-commits] tilghman: branch 1.6.0 r134484 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Jul 30 14:18:12 2008
New Revision: 134484

URL: http://svn.digium.com/view/asterisk?view=rev&rev=134484
Log:
Merged revisions 134483 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r134483 | tilghman | 2008-07-30 14:17:38 -0500 (Wed, 30 Jul 2008) | 4 lines

Let "roundrobin" also reference rrmemory, for the 1.6 release (as described in
UPGRADE-1.4.txt)
(Closes issue #13181)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_queue.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=134484&r1=134483&r2=134484
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Wed Jul 30 14:18:12 2008
@@ -127,6 +127,7 @@
 	{ QUEUE_STRATEGY_FEWESTCALLS, "fewestcalls" },
 	{ QUEUE_STRATEGY_RANDOM, "random" },
 	{ QUEUE_STRATEGY_RRMEMORY, "rrmemory" },
+	{ QUEUE_STRATEGY_RRMEMORY, "roundrobin" },
 	{ QUEUE_STRATEGY_LINEAR, "linear" },
 	{ QUEUE_STRATEGY_WRANDOM, "wrandom"},
 };