[asterisk-commits] bebuild: tag 11.0.1 r375836 - in /tags/11.0.1: ./ apps/

[SVN commits to the Asterisk project]

Author: bebuild
Date: Mon Nov  5 10:56:31 2012
New Revision: 375836

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=375836
Log:
Merge fix for ASTERISK-20601

Modified:
    tags/11.0.1/   (props changed)
    tags/11.0.1/ChangeLog
    tags/11.0.1/apps/app_confbridge.c

Propchange: tags/11.0.1/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Propchange: tags/11.0.1/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Mon Nov  5 10:56:31 2012
@@ -1,1 +1,2 @@
-menuselect https://origsvn.digium.com/svn/menuselect/tags/autotag_for_asterisk/11.0.0-rc1
+menuselect 
+https://origsvn.digium.com/svn/menuselect/tags/autotag_for_asterisk/11.0.1

Propchange: tags/11.0.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  5 10:56:31 2012
@@ -1,1 +1,1 @@
-/branches/11:374792,374842,374850-374851,374877,375051,375148,375559,375575
+/branches/11:374792,374842,374850-374851,374877,375051,375148,375471,375559,375575

Modified: tags/11.0.1/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/11.0.1/ChangeLog?view=diff&rev=375836&r1=375835&r2=375836
==============================================================================
--- tags/11.0.1/ChangeLog (original)
+++ tags/11.0.1/ChangeLog Mon Nov  5 10:56:31 2012
@@ -1,6 +1,12 @@
 2012-11-05  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 11.0.1 Released.
+
+	* Fix a bug which made ConfBridge not record conferences when the
+	  record command was initiated from AMI/CLI commands
+
+	  (closes issue ASTERISK-20601)
+	  Reported by: Vilius
 
 	* Fix a bug causing SIP reloads to remove all entries from the registry
 

Modified: tags/11.0.1/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/tags/11.0.1/apps/app_confbridge.c?view=diff&rev=375836&r1=375835&r2=375836
==============================================================================
--- tags/11.0.1/apps/app_confbridge.c (original)
+++ tags/11.0.1/apps/app_confbridge.c Mon Nov  5 10:56:31 2012
@@ -2264,7 +2264,7 @@
 		ast_copy_string(bridge->b_profile.rec_file, rec_file, sizeof(bridge->b_profile.rec_file));
 	}
 
-	if (conf_start_record(bridge)) {
+	if (start_conf_record_thread(bridge)) {
 		ast_cli(a->fd, "Could not start recording due to internal error.\n");
 		ao2_unlock(bridge);
 		ao2_ref(bridge, -1);
@@ -2602,7 +2602,7 @@
 		ast_copy_string(bridge->b_profile.rec_file, recordfile, sizeof(bridge->b_profile.rec_file));
 	}
 
-	if (conf_start_record(bridge)) {
+	if (start_conf_record_thread(bridge)) {
 		astman_send_error(s, m, "Internal error starting conference recording.");
 		ao2_unlock(bridge);
 		ao2_ref(bridge, -1);