diff options
author | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-25 12:08:58 +0000 |
---|---|---|
committer | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-25 12:08:58 +0000 |
commit | c2ea64ec74f747af1f2d9d208be2bce64eb334ac (patch) | |
tree | e2133fbf6a28f43b21312b1a96ff000aaafa7b18 | |
parent | 0aa9787ac3a6868f8f6c2a442de49ccf6532502b (diff) |
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.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@208816 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | configs/cli_aliases.conf.sample | 1 | ||||
-rw-r--r-- | main/cli.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/configs/cli_aliases.conf.sample b/configs/cli_aliases.conf.sample index 7743a47d6..5c4fd88c5 100644 --- a/configs/cli_aliases.conf.sample +++ b/configs/cli_aliases.conf.sample @@ -27,6 +27,7 @@ hangup request=channel request hangup originate=channel originate help=core show help pri intense debug span=pri set debug 2 span +reload=module reload ; CLI Alias Templates ; ------------------- diff --git a/main/cli.c b/main/cli.c index d88ae161f..f72948339 100644 --- a/main/cli.c +++ b/main/cli.c @@ -266,11 +266,6 @@ static char *handle_load(struct ast_cli_entry *e, int cmd, struct ast_cli_args * 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; |