[asterisk-commits] tilghman: trunk r284633 - in /trunk: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Sep  2 00:31:47 2010
New Revision: 284633

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

................
  r284632 | tilghman | 2010-09-02 00:31:02 -0500 (Thu, 02 Sep 2010) | 14 lines
  
  Merged revisions 284631 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r284631 | tilghman | 2010-09-02 00:30:16 -0500 (Thu, 02 Sep 2010) | 7 lines
    
    Don't reset queue stats on a module reload.
    
    (closes issue #17535)
     Reported by: raarts
     Patches: 
           20100819__issue17535.diff.txt uploaded by tilghman (license 14)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

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

Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=284633&r1=284632&r2=284633
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Thu Sep  2 00:31:47 2010
@@ -8186,7 +8186,7 @@
 
 static int reload(void)
 {
-	struct ast_flags mask = {AST_FLAGS_ALL,};
+	struct ast_flags mask = {AST_FLAGS_ALL & ~QUEUE_RESET_STATS,};
 	ast_unload_realtime("queue_members");
 	reload_handler(1, &mask, NULL);
 	return 0;