[asterisk-commits] bebuild: tag 10.10.0-rc2 r375839 - in /tags/10.10.0-rc2: ./ apps/

[SVN commits to the Asterisk project]

Author: bebuild
Date: Mon Nov  5 11:11:10 2012
New Revision: 375839

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=375839
Log:
Update 10.10.0-rc2

Merge r375470 for ASTERISK-20601

Removed:
    tags/10.10.0-rc2/asterisk-10.10.0-rc1-summary.html
    tags/10.10.0-rc2/asterisk-10.10.0-rc1-summary.txt
Modified:
    tags/10.10.0-rc2/   (props changed)
    tags/10.10.0-rc2/.version
    tags/10.10.0-rc2/ChangeLog
    tags/10.10.0-rc2/apps/app_confbridge.c

Propchange: tags/10.10.0-rc2/
------------------------------------------------------------------------------
    svn:mergeinfo = /branches/10:375470

Modified: tags/10.10.0-rc2/.version
URL: http://svnview.digium.com/svn/asterisk/tags/10.10.0-rc2/.version?view=diff&rev=375839&r1=375838&r2=375839
==============================================================================
--- tags/10.10.0-rc2/.version (original)
+++ tags/10.10.0-rc2/.version Mon Nov  5 11:11:10 2012
@@ -1,1 +1,1 @@
-10.10.0-rc1
+10.10.0-rc2

Modified: tags/10.10.0-rc2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/10.10.0-rc2/ChangeLog?view=diff&rev=375839&r1=375838&r2=375839
==============================================================================
--- tags/10.10.0-rc2/ChangeLog (original)
+++ tags/10.10.0-rc2/ChangeLog Mon Nov  5 11:11:10 2012
@@ -1,3 +1,13 @@
+2012-11-05  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 10.10.0-rc2 Released.
+
+	* Fix a bug which made ConfBridge not record the conference when
+	  the recording was initiated from an AMI/CLI command
+
+	  (closes issue ASTERISK-20601)
+	  Reported by: Vilius
+
 2012-10-08  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 10.10.0-rc1 Released.

Modified: tags/10.10.0-rc2/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/tags/10.10.0-rc2/apps/app_confbridge.c?view=diff&rev=375839&r1=375838&r2=375839
==============================================================================
--- tags/10.10.0-rc2/apps/app_confbridge.c (original)
+++ tags/10.10.0-rc2/apps/app_confbridge.c Mon Nov  5 11:11:10 2012
@@ -2157,7 +2157,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);
@@ -2495,7 +2495,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);