kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 19:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 377035,377040 via svnmerge from

Browse Source 
file:///srv/subversion/repos/asterisk/trunk

................
  r377035 | oej | 2012-12-03 10:45:49 -0600 (Mon, 03 Dec 2012) | 2 lines
  
  Formatting fixes
................
  r377040 | rmudgett | 2012-12-03 11:10:40 -0600 (Mon, 03 Dec 2012) | 16 lines
  
  Fix CCSS CLI commands and logger level not unregistered.
  
  (issue ASTERISK-20649)
  Reported by: Corey Farrell
  Patches:
        ccss-cleanup-all.patch (license #5909) patch uploaded by Corey Farrell
  ........
  
  Merged revisions 377037 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 377038 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........
  
  Merged revisions 377039 from http://svn.asterisk.org/svn/asterisk/branches/11
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377047 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2012-12-03 17:19:46 +00:00
parent e7ce12839d
commit f6f7774b19
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/ccss.c
View File

@@ -4536,6 +4536,8 @@ static void cc_shutdown(void)
ast_cc_monitor_unregister(&generic_monitor_cbs);
ast_unregister_application(cccancel_app);
ast_unregister_application(ccreq_app);
ast_logger_unregister_level(CC_LOGGER_LEVEL_NAME);
ast_cli_unregister_multiple(cc_cli, ARRAY_LEN(cc_cli));
if (cc_sched_context) {
ast_sched_context_destroy(cc_sched_context);