Merge "res_pjsip_registrar_expire: Delete empty module."

CHANGES

@@ -54,6 +54,11 @@ res_pjsip
  * A new AMI action, PJSIPShowContacts, has been added which displays information
    about all configured PJSIP Contacts.
 
+res_pjsip_registrar_expire
+------------------
+ * The res_pjsip_registrar_expire module has been removed.  The functionality has
+   been moved into res_pjsip_registrar.
+
 cdr_syslog
 ------------------
  * The cdr_syslog module is now deprecated and by default it is no longer

res/res_pjsip_registrar_expire.c

@@ -1,49 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2013, Digium, Inc.
- *
- * Joshua Colp <jcolp@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*** MODULEINFO
-	<depend>pjproject</depend>
-	<depend>res_pjsip</depend>
-	<support_level>extended</support_level>
- ***/
-
-/*
- * This module has been refactored into res_pjsip_registrar
- */
-
-#include "asterisk.h"
-
-#include "asterisk/module.h"
-
-static int unload_module(void)
-{
-	return 0;
-}
-
-static int load_module(void)
-{
-	return AST_MODULE_LOAD_SUCCESS;
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "OBSOLETE PJSIP Contact Auto-Expiration",
-	.support_level = AST_MODULE_SUPPORT_EXTENDED,
-	.load = load_module,
-	.unload = unload_module,
-	.load_pri = AST_MODPRI_APP_DEPEND,
-	.requires = "res_pjsip",
-);