<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16926">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: explicit<br><br>Change-Id: If8c6948d29f5822d0e3475957ae9b814c31d28d6<br>---<br>M apps/app_confbridge.c<br>M apps/app_macro.c<br>2 files changed, 2 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/26/16926/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c</span><br><span>index fa58a77..2c20ff5 100644</span><br><span>--- a/apps/app_confbridge.c</span><br><span>+++ b/apps/app_confbridge.c</span><br><span>@@ -1682,7 +1682,7 @@</span><br><span>      struct post_join_action *action;</span><br><span>     int max_members_reached = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        /* We explictly lock the conference bridges container ourselves so that other callers can not create duplicate conferences at the same */</span><br><span style="color: hsl(120, 100%, 40%);">+     /* We explicitly lock the conference bridges container ourselves so that other callers can not create duplicate conferences at the same */</span><br><span>   ao2_lock(conference_bridges);</span><br><span> </span><br><span>    ast_debug(1, "Trying to find conference bridge '%s'\n", conference_name);</span><br><span>diff --git a/apps/app_macro.c b/apps/app_macro.c</span><br><span>index 3f7632a..b426cf8 100644</span><br><span>--- a/apps/app_macro.c</span><br><span>+++ b/apps/app_macro.c</span><br><span>@@ -75,7 +75,7 @@</span><br><span>                         of nesting (macro calling macro calling macro, etc.); It may be possible that stack-intensive</span><br><span>                        applications in deeply nested macros could cause asterisk to crash earlier than this limit.</span><br><span>                  It is advised that if you need to deeply nest macro calls, that you use the Gosub application</span><br><span style="color: hsl(0, 100%, 40%);">-                   (now allows arguments like a Macro) with explict Return() calls instead.</para></warning></span><br><span style="color: hsl(120, 100%, 40%);">+                 (now allows arguments like a Macro) with explicit Return() calls instead.</para></warning></span><br><span>                       <warning><para>Use of the application <literal>WaitExten</literal> within a macro will not function</span><br><span>                  as expected. Please use the <literal>Read</literal> application in order to read DTMF from a channel</span><br><span>                     currently executing a macro.</para></warning></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16926">change 16926</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/16926"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If8c6948d29f5822d0e3475957ae9b814c31d28d6 </div>
<div style="display:none"> Gerrit-Change-Number: 16926 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Josh Soref <jsoref@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Friendly Automation </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>