Merge "res_parking: Stop setting the deprecated PARKINGSLOT channel variable."

UPGRADE.txt

@@ -30,4 +30,7 @@ New in 17.0.0:
 * The CALLERPRES() dialplan function, deprecated in Asterisk 1.8, has been
   removed.
 
+* The PARKINGSLOT channel variable, deprecated in Asterisk 12 in favor of the
+  PARKING_SPACE channel variable, will no longer be set.
+
 * The JabberStatus application, deprecated in Asterisk 12, has been removed.

res/parking/parking_bridge_features.c

@@ -603,7 +603,6 @@ static int parking_duration_callback(struct ast_bridge_channel *bridge_channel,
 	ast_channel_lock(chan);
 	ast_channel_stage_snapshot(chan);
 	pbx_builtin_setvar_helper(chan, "PARKING_SPACE", parking_space);
-	pbx_builtin_setvar_helper(chan, "PARKINGSLOT", parking_space); /* Deprecated version of PARKING_SPACE */
 	pbx_builtin_setvar_helper(chan, "PARKEDLOT", user->lot->name);
 	pbx_builtin_setvar_helper(chan, "PARKER", dial_string);
 	pbx_builtin_setvar_helper(chan, "PARKER_FLAT", dial_string_flat);

res/res_parking.c

@@ -149,9 +149,6 @@
 							<variable name="PARKING_SPACE">
 								<para>extension that the call was parked in prior to timing out.</para>
 							</variable>
-							<variable name="PARKINGSLOT">
-								<para>Deprecated.  Use <variable>PARKING_SPACE</variable> instead.</para>
-							</variable>
 							<variable name="PARKEDLOT">
 								<para>name of the lot that the call was parked in prior to timing out.</para>
 							</variable>