[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r321679 - in /team/irroot/dist...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Jun 3 07:33:38 CDT 2011
Author: irroot
Date: Fri Jun 3 07:26:39 2011
New Revision: 321679
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321679
Log:
Fixup
Modified:
team/irroot/distrotech-customers-1.8/ (props changed)
team/irroot/distrotech-customers-1.8/cel/cel_odbc.c (props changed)
team/irroot/distrotech-customers-1.8/channels/chan_local.c
team/irroot/distrotech-customers-1.8/channels/chan_sip.c
team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql (props changed)
team/irroot/distrotech-customers-1.8/sounds/Makefile (props changed)
Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
automerge = *
Propchange: team/irroot/distrotech-customers-1.8/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 07:26:39 2011
@@ -1,5 +1,5 @@
/be/branches/C.3/cel/cel_adaptive_odbc.c:256426
-/branches/1.8/cel/cel_odbc.c:321461-321547
+/branches/1.8/cel/cel_odbc.c:318982-321547
/team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319067
/team/irroot/distrotech-customers-trunk/cel/cel_odbc.c:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/cel/cel_odbc.c:318979-319017,319357,321514
Modified: team/irroot/distrotech-customers-1.8/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/chan_local.c?view=diff&rev=321679&r1=321678&r2=321679
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_local.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_local.c Fri Jun 3 07:26:39 2011
@@ -601,7 +601,6 @@
CHANNEL_DEADLOCK_AVOIDANCE(ast);
}
ao2_ref(p, 1); /* ref for local_queue_frame */
- ao2_ref(p, 1); /* ref for local_queue_frame */
ao2_lock(p);
isoutbound = IS_OUTBOUND(ast, p);
Modified: team/irroot/distrotech-customers-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/chan_sip.c?view=diff&rev=321679&r1=321678&r2=321679
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_sip.c Fri Jun 3 07:26:39 2011
@@ -6311,6 +6311,7 @@
if (!ast_channel_trylock(bridge)) {
ast_log(LOG_WARNING, "Attempting to change formats making %s and %s compat.\n", ast->name, bridge->name);
ast_channel_make_compatible(ast, bridge);
+ ast_channel_unlock(bridge);
}
return 0;
}
Propchange: team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 07:26:39 2011
@@ -1,5 +1,5 @@
/be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
-/branches/1.8/configs/cel_odbc.conf.sample:321461-321547
+/branches/1.8/configs/cel_odbc.conf.sample:318982-321547
/team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319067
/team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 07:26:39 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/mysql/iaxfriends.sql:321461-321547
+/branches/1.8/contrib/realtime/mysql/iaxfriends.sql:318982-321547
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/iaxfriends.sql:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 07:26:39 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/mysql/meetme.sql:321461-321547
+/branches/1.8/contrib/realtime/mysql/meetme.sql:318982-321547
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/meetme.sql:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 07:26:39 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/mysql/sipfriends.sql:321461-321547
+/branches/1.8/contrib/realtime/mysql/sipfriends.sql:318982-321547
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/sipfriends.sql:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 07:26:39 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/mysql/voicemail.sql:321461-321547
+/branches/1.8/contrib/realtime/mysql/voicemail.sql:318982-321547
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/voicemail.sql:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 07:26:39 2011
@@ -1,4 +1,4 @@
-/branches/1.8/contrib/realtime/postgresql/realtime.sql:321461-321547
+/branches/1.8/contrib/realtime/postgresql/realtime.sql:318982-321547
/team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/postgresql/realtime.sql:320619,320821-320822,321099,321552
/team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql:318979-319017,319357,321514
Propchange: team/irroot/distrotech-customers-1.8/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 07:26:39 2011
@@ -1,2 +1,2 @@
-/branches/1.8/sounds/Makefile:321461-321547
+/branches/1.8/sounds/Makefile:318982-321547
/team/irroot/t38gateway-trunk/sounds/Makefile:320880-321512,321514-321541
More information about the asterisk-commits
mailing list