[svn-commits] mvanbaak: branch 1.6.2 r208816 - in /branches/1.6.2: ./ configs/ main/

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Sat Jul 25 07:08:58 2009
New Revision: 208816

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=208816
Log:
Merged revisions 208813 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r208813 | mvanbaak | 2009-07-25 14:03:25 +0200 (Sat, 25 Jul 2009) | 10 lines
  
  add default alias reload to run module reload.
  
  Requiring 'module reload' to reload everything, including
  core etc makes russell very unhappy.
  
  The default configuration already loads the 'friendly' aliases template.
  Added 'reload=module reload' to that template.
  
  Also removed the comment in main/cli.c that reload should come back.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/configs/cli_aliases.conf.sample
    branches/1.6.2/main/cli.c

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

Modified: branches/1.6.2/configs/cli_aliases.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/configs/cli_aliases.conf.sample?view=diff&rev=208816&r1=208815&r2=208816
==============================================================================
--- branches/1.6.2/configs/cli_aliases.conf.sample (original)
+++ branches/1.6.2/configs/cli_aliases.conf.sample Sat Jul 25 07:08:58 2009
@@ -27,6 +27,7 @@
 originate=channel originate
 help=core show help
 pri intense debug span=pri set debug 2 span
+reload=module reload
 
 ; CLI Alias Templates
 ; -------------------

Modified: branches/1.6.2/main/cli.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/main/cli.c?view=diff&rev=208816&r1=208815&r2=208816
==============================================================================
--- branches/1.6.2/main/cli.c (original)
+++ branches/1.6.2/main/cli.c Sat Jul 25 07:08:58 2009
@@ -266,11 +266,6 @@
 	return CLI_SUCCESS;
 }
 
-/*!
- * \bug The command "reload" needs to be re-added.  Requiring "module reload" to reload everything,
- *      including core stuff, doesn't really make sense.  Adding a "core reload" to reload everything,
- *      including modules, also doesn't really make sense.  So, we should put "reload" back.
- */
 static char *handle_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
 	int x;