[svn-commits] rmudgett: trunk r400228 - in /trunk: ./ main/features_config.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Oct  1 11:44:22 2013
New Revision: 400228

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=400228
Log:
Features: Rearm the parking config options have moved warning for each reload.
........

Merged revisions 400227 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/features_config.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Tue Oct  1 11:44:22 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-400181,400194,400196,400205,400217
+/branches/12:1-398558,398560-398577,398579-399305,399307-400181,400194,400196,400205,400217,400227

Modified: trunk/main/features_config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features_config.c?view=diff&rev=400228&r1=400227&r2=400228
==============================================================================
--- trunk/main/features_config.c (original)
+++ trunk/main/features_config.c Tue Oct  1 11:44:22 2013
@@ -1868,6 +1868,9 @@
 
 int ast_features_config_reload(void)
 {
+	/* Rearm the parking config options have moved warning. */
+	parking_warning = 0;
+
 	if (aco_process_config(&cfg_info, 1) == ACO_PROCESS_ERROR) {
 		return -1;
 	}