<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10078">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Corey Farrell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">optional_api: Remove unused nonoptreq fields<br><br>As they're not actively used, they only grow stale. The moduleinfo field itself<br>is kept in Asterisk 13/15 for ABI compatibility.<br><br>ASTERISK-28046 #close<br><br>Change-Id: I8df66a7007f807840414bb348511a8c14c05a9fc<br>---<br>M apps/app_adsiprog.c<br>M apps/app_getcpeid.c<br>M apps/app_queue.c<br>M apps/app_speech_utils.c<br>M apps/app_stack.c<br>M apps/app_stasis.c<br>M apps/app_voicemail.c<br>M channels/chan_dahdi.c<br>M channels/chan_iax2.c<br>M channels/chan_mgcp.c<br>M channels/chan_sip.c<br>M funcs/func_aes.c<br>M include/asterisk/module.h<br>M pbx/pbx_dundi.c<br>M res/res_ari.c<br>M res/res_ari_applications.c<br>M res/res_ari_asterisk.c<br>M res/res_ari_bridges.c<br>M res/res_ari_channels.c<br>M res/res_ari_device_states.c<br>M res/res_ari_endpoints.c<br>M res/res_ari_events.c<br>M res/res_ari_mailboxes.c<br>M res/res_ari_playbacks.c<br>M res/res_ari_recordings.c<br>M res/res_ari_sounds.c<br>M res/res_chan_stats.c<br>M res/res_endpoint_stats.c<br>M res/res_stasis_answer.c<br>M res/res_stasis_device_state.c<br>M res/res_stasis_mailbox.c<br>M res/res_stasis_playback.c<br>M res/res_stasis_recording.c<br>M res/res_stasis_snoop.c<br>M res/res_stasis_test.c<br>M rest-api-templates/res_ari_resource.c.mustache<br>M tests/test_ari.c<br>M tests/test_res_stasis.c<br>M tests/test_stasis_endpoints.c<br>39 files changed, 11 insertions(+), 45 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c</span><br><span>index e73795a..6ca02a7 100644</span><br><span>--- a/apps/app_adsiprog.c</span><br><span>+++ b/apps/app_adsiprog.c</span><br><span>@@ -1615,5 +1615,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_EXTENDED,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_adsi",</span><br><span> );</span><br><span>diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c</span><br><span>index 87a9701..eff9d08 100644</span><br><span>--- a/apps/app_getcpeid.c</span><br><span>+++ b/apps/app_getcpeid.c</span><br><span>@@ -142,5 +142,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_EXTENDED,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_adsi",</span><br><span> );</span><br><span>diff --git a/apps/app_queue.c b/apps/app_queue.c</span><br><span>index 6bc2e67..2c7ed2a 100644</span><br><span>--- a/apps/app_queue.c</span><br><span>+++ b/apps/app_queue.c</span><br><span>@@ -11086,5 +11086,4 @@</span><br><span> .unload = unload_module,</span><br><span> .reload = reload,</span><br><span> .load_pri = AST_MODPRI_DEVSTATE_CONSUMER,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_monitor",</span><br><span> );</span><br><span>diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c</span><br><span>index 49b5b30..0beccc6 100644</span><br><span>--- a/apps/app_speech_utils.c</span><br><span>+++ b/apps/app_speech_utils.c</span><br><span>@@ -1005,5 +1005,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_speech",</span><br><span> );</span><br><span>diff --git a/apps/app_stack.c b/apps/app_stack.c</span><br><span>index 4cade64..cc5c487 100644</span><br><span>--- a/apps/app_stack.c</span><br><span>+++ b/apps/app_stack.c</span><br><span>@@ -1322,5 +1322,4 @@</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span> .load_pri = AST_MODPRI_APP_DEPEND,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_agi",</span><br><span> );</span><br><span>diff --git a/apps/app_stasis.c b/apps/app_stasis.c</span><br><span>index 1e5b567..e0beee2 100644</span><br><span>--- a/apps/app_stasis.c</span><br><span>+++ b/apps/app_stasis.c</span><br><span>@@ -146,5 +146,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_stasis",</span><br><span> );</span><br><span>diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c</span><br><span>index 94af147..96699e6 100644</span><br><span>--- a/apps/app_voicemail.c</span><br><span>+++ b/apps/app_voicemail.c</span><br><span>@@ -16494,5 +16494,4 @@</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span> .reload = reload,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_adsi,res_smdi",</span><br><span> );</span><br><span>diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c</span><br><span>index 2f5daae..3b05d72 100644</span><br><span>--- a/channels/chan_dahdi.c</span><br><span>+++ b/channels/chan_dahdi.c</span><br><span>@@ -19857,5 +19857,4 @@</span><br><span> .unload = unload_module,</span><br><span> .reload = reload,</span><br><span> .load_pri = AST_MODPRI_CHANNEL_DRIVER,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_smdi",</span><br><span> );</span><br><span>diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c</span><br><span>index 4e3816e..7a369e1 100644</span><br><span>--- a/channels/chan_iax2.c</span><br><span>+++ b/channels/chan_iax2.c</span><br><span>@@ -15245,5 +15245,4 @@</span><br><span> .unload = unload_module,</span><br><span> .reload = reload,</span><br><span> .load_pri = AST_MODPRI_CHANNEL_DRIVER,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_crypto",</span><br><span style="color: hsl(0, 100%, 40%);">- );</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span>diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c</span><br><span>index e8c2293..c9ed1e2 100644</span><br><span>--- a/channels/chan_mgcp.c</span><br><span>+++ b/channels/chan_mgcp.c</span><br><span>@@ -5016,5 +5016,4 @@</span><br><span> .unload = unload_module,</span><br><span> .reload = reload,</span><br><span> .load_pri = AST_MODPRI_CHANNEL_DRIVER,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_pktccops",</span><br><span> );</span><br><span>diff --git a/channels/chan_sip.c b/channels/chan_sip.c</span><br><span>index af4f06d..ebfcfeb 100644</span><br><span>--- a/channels/chan_sip.c</span><br><span>+++ b/channels/chan_sip.c</span><br><span>@@ -35740,5 +35740,4 @@</span><br><span> .unload = unload_module,</span><br><span> .reload = reload,</span><br><span> .load_pri = AST_MODPRI_CHANNEL_DRIVER,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_crypto,res_http_websocket",</span><br><span> );</span><br><span>diff --git a/funcs/func_aes.c b/funcs/func_aes.c</span><br><span>index c51fe0a..2592dc3 100644</span><br><span>--- a/funcs/func_aes.c</span><br><span>+++ b/funcs/func_aes.c</span><br><span>@@ -183,5 +183,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_crypto",</span><br><span style="color: hsl(0, 100%, 40%);">- );</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span>diff --git a/include/asterisk/module.h b/include/asterisk/module.h</span><br><span>index 0b8fbad..384cf4c 100644</span><br><span>--- a/include/asterisk/module.h</span><br><span>+++ b/include/asterisk/module.h</span><br><span>@@ -341,9 +341,8 @@</span><br><span> * on load. */</span><br><span> unsigned char load_pri;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /*! Modules which should be loaded first, in comma-separated string format.</span><br><span style="color: hsl(0, 100%, 40%);">- * These are only required for loading, when the optional_api header file</span><br><span style="color: hsl(0, 100%, 40%);">- * detects that the compiler does not support the optional API featureset. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Obsolete! This is not used since the optional_api portability rework.</span><br><span style="color: hsl(120, 100%, 40%);">+ * This field does nothing and will be removed in future version of Asterisk. */</span><br><span> const char *nonoptreq;</span><br><span> /*! The support level for the given module */</span><br><span> enum ast_module_support_level support_level;</span><br><span>diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c</span><br><span>index bbcae06..d2c9877 100644</span><br><span>--- a/pbx/pbx_dundi.c</span><br><span>+++ b/pbx/pbx_dundi.c</span><br><span>@@ -5103,5 +5103,4 @@</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span> .reload = reload,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_crypto",</span><br><span> );</span><br><span>diff --git a/res/res_ari.c b/res/res_ari.c</span><br><span>index 75af26b..0554587 100644</span><br><span>--- a/res/res_ari.c</span><br><span>+++ b/res/res_ari.c</span><br><span>@@ -1194,6 +1194,5 @@</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span> .reload = reload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_http_websocket",</span><br><span> .load_pri = AST_MODPRI_APP_DEPEND,</span><br><span> );</span><br><span>diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c</span><br><span>index 290719d..c70b926 100644</span><br><span>--- a/res/res_ari_applications.c</span><br><span>+++ b/res/res_ari_applications.c</span><br><span>@@ -520,5 +520,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari,res_stasis",</span><br><span> );</span><br><span>diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c</span><br><span>index 73e4d0c..7480ac8 100644</span><br><span>--- a/res/res_ari_asterisk.c</span><br><span>+++ b/res/res_ari_asterisk.c</span><br><span>@@ -1241,5 +1241,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari,res_stasis",</span><br><span> );</span><br><span>diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c</span><br><span>index b923330..0e1bf1c 100644</span><br><span>--- a/res/res_ari_bridges.c</span><br><span>+++ b/res/res_ari_bridges.c</span><br><span>@@ -1433,5 +1433,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari,res_stasis",</span><br><span> );</span><br><span>diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c</span><br><span>index 6217679..dafca15 100644</span><br><span>--- a/res/res_ari_channels.c</span><br><span>+++ b/res/res_ari_channels.c</span><br><span>@@ -2497,5 +2497,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari,res_stasis",</span><br><span> );</span><br><span>diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c</span><br><span>index fe1817d..f1125b8 100644</span><br><span>--- a/res/res_ari_device_states.c</span><br><span>+++ b/res/res_ari_device_states.c</span><br><span>@@ -351,5 +351,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari,res_stasis",</span><br><span> );</span><br><span>diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c</span><br><span>index a46b0dc..11ce4c3 100644</span><br><span>--- a/res/res_ari_endpoints.c</span><br><span>+++ b/res/res_ari_endpoints.c</span><br><span>@@ -475,5 +475,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari,res_stasis",</span><br><span> );</span><br><span>diff --git a/res/res_ari_events.c b/res/res_ari_events.c</span><br><span>index b6a44d9..04c1c79 100644</span><br><span>--- a/res/res_ari_events.c</span><br><span>+++ b/res/res_ari_events.c</span><br><span>@@ -467,5 +467,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari,res_stasis",</span><br><span> );</span><br><span>diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c</span><br><span>index 600ecfd..22b0ca2 100644</span><br><span>--- a/res/res_ari_mailboxes.c</span><br><span>+++ b/res/res_ari_mailboxes.c</span><br><span>@@ -357,5 +357,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari,res_stasis",</span><br><span> );</span><br><span>diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c</span><br><span>index 106463b..fca079b 100644</span><br><span>--- a/res/res_ari_playbacks.c</span><br><span>+++ b/res/res_ari_playbacks.c</span><br><span>@@ -309,5 +309,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari,res_stasis",</span><br><span> );</span><br><span>diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c</span><br><span>index c43148d..033a480 100644</span><br><span>--- a/res/res_ari_recordings.c</span><br><span>+++ b/res/res_ari_recordings.c</span><br><span>@@ -825,5 +825,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari,res_stasis",</span><br><span> );</span><br><span>diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c</span><br><span>index e58ecd1..6473985 100644</span><br><span>--- a/res/res_ari_sounds.c</span><br><span>+++ b/res/res_ari_sounds.c</span><br><span>@@ -239,5 +239,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari,res_stasis",</span><br><span> );</span><br><span>diff --git a/res/res_chan_stats.c b/res/res_chan_stats.c</span><br><span>index 9104e0e..2648d60 100644</span><br><span>--- a/res/res_chan_stats.c</span><br><span>+++ b/res/res_chan_stats.c</span><br><span>@@ -184,5 +184,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_EXTENDED,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_statsd"</span><br><span> );</span><br><span>diff --git a/res/res_endpoint_stats.c b/res/res_endpoint_stats.c</span><br><span>index e2b4ffa..85d75e4 100644</span><br><span>--- a/res/res_endpoint_stats.c</span><br><span>+++ b/res/res_endpoint_stats.c</span><br><span>@@ -153,5 +153,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_EXTENDED,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_statsd"</span><br><span> );</span><br><span>diff --git a/res/res_stasis_answer.c b/res/res_stasis_answer.c</span><br><span>index 05d5302..5d2e67c 100644</span><br><span>--- a/res/res_stasis_answer.c</span><br><span>+++ b/res/res_stasis_answer.c</span><br><span>@@ -75,4 +75,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_stasis");</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span>diff --git a/res/res_stasis_device_state.c b/res/res_stasis_device_state.c</span><br><span>index 9924dd8..34c77d9 100644</span><br><span>--- a/res/res_stasis_device_state.c</span><br><span>+++ b/res/res_stasis_device_state.c</span><br><span>@@ -484,4 +484,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_stasis");</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span>diff --git a/res/res_stasis_mailbox.c b/res/res_stasis_mailbox.c</span><br><span>index 6e5e5ff..1c6918d 100644</span><br><span>--- a/res/res_stasis_mailbox.c</span><br><span>+++ b/res/res_stasis_mailbox.c</span><br><span>@@ -163,5 +163,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_stasis,res_mwi_external"</span><br><span> );</span><br><span>diff --git a/res/res_stasis_playback.c b/res/res_stasis_playback.c</span><br><span>index 57d1fd2..6a0e6c3 100644</span><br><span>--- a/res/res_stasis_playback.c</span><br><span>+++ b/res/res_stasis_playback.c</span><br><span>@@ -688,4 +688,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_stasis,res_stasis_recording");</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span>diff --git a/res/res_stasis_recording.c b/res/res_stasis_recording.c</span><br><span>index 5508be8..93c32c9 100644</span><br><span>--- a/res/res_stasis_recording.c</span><br><span>+++ b/res/res_stasis_recording.c</span><br><span>@@ -657,5 +657,5 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_stasis",</span><br><span style="color: hsl(0, 100%, 40%);">- .load_pri = AST_MODPRI_APP_DEPEND);</span><br><span style="color: hsl(120, 100%, 40%);">+ .load_pri = AST_MODPRI_APP_DEPEND,</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span>diff --git a/res/res_stasis_snoop.c b/res/res_stasis_snoop.c</span><br><span>index da66894..785bbe2 100644</span><br><span>--- a/res/res_stasis_snoop.c</span><br><span>+++ b/res/res_stasis_snoop.c</span><br><span>@@ -447,4 +447,4 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_stasis");</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span>diff --git a/res/res_stasis_test.c b/res/res_stasis_test.c</span><br><span>index fe015ec..fbf4202 100644</span><br><span>--- a/res/res_stasis_test.c</span><br><span>+++ b/res/res_stasis_test.c</span><br><span>@@ -104,8 +104,7 @@</span><br><span> * it has to do with how we load modules.</span><br><span> *</span><br><span> * Modules have their own metadata compiled into them in the module info block</span><br><span style="color: hsl(0, 100%, 40%);">- * at the end of the file. This includes dependency information in the</span><br><span style="color: hsl(0, 100%, 40%);">- * \c nonoptreq field.</span><br><span style="color: hsl(120, 100%, 40%);">+ * at the end of the file.</span><br><span> *</span><br><span> * Asterisk loads the module, inspects the field, then loads any needed</span><br><span> * dependencies. This works because Asterisk passes \c RTLD_LAZY to the initial</span><br><span>diff --git a/rest-api-templates/res_ari_resource.c.mustache b/rest-api-templates/res_ari_resource.c.mustache</span><br><span>index 0e8635d..40e1855 100644</span><br><span>--- a/rest-api-templates/res_ari_resource.c.mustache</span><br><span>+++ b/rest-api-templates/res_ari_resource.c.mustache</span><br><span>@@ -305,6 +305,5 @@</span><br><span> .support_level = AST_MODULE_SUPPORT_CORE,</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari,res_stasis",</span><br><span> );</span><br><span> {{/api_declaration}}</span><br><span>diff --git a/tests/test_ari.c b/tests/test_ari.c</span><br><span>index e2c36fb..6043adf 100644</span><br><span>--- a/tests/test_ari.c</span><br><span>+++ b/tests/test_ari.c</span><br><span>@@ -574,5 +574,4 @@</span><br><span> AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ARI testing",</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_ari",</span><br><span> );</span><br><span>diff --git a/tests/test_res_stasis.c b/tests/test_res_stasis.c</span><br><span>index 805634f..7b1c8ca 100644</span><br><span>--- a/tests/test_res_stasis.c</span><br><span>+++ b/tests/test_res_stasis.c</span><br><span>@@ -196,5 +196,4 @@</span><br><span> AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis Core testing",</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_stasis",</span><br><span> );</span><br><span>diff --git a/tests/test_stasis_endpoints.c b/tests/test_stasis_endpoints.c</span><br><span>index 17e2d05..c7645fd 100644</span><br><span>--- a/tests/test_stasis_endpoints.c</span><br><span>+++ b/tests/test_stasis_endpoints.c</span><br><span>@@ -307,5 +307,4 @@</span><br><span> AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Endpoint stasis-related testing",</span><br><span> .load = load_module,</span><br><span> .unload = unload_module,</span><br><span style="color: hsl(0, 100%, 40%);">- .nonoptreq = "res_stasis_test",</span><br><span> );</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10078">change 10078</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/10078"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8df66a7007f807840414bb348511a8c14c05a9fc </div>
<div style="display:none"> Gerrit-Change-Number: 10078 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Walter Doekes <walter+asterisk@wjd.nu> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>