From 07bf7890dcb0c9929ee5ac07e0b7320246c7cd91 Mon Sep 17 00:00:00 2001
From: Asterisk Development Team <asteriskteam@digium.com>
Date: Thu, 28 May 2020 07:05:36 -0500
Subject: [PATCH] Update CHANGES and UPGRADE.txt for 13.34.0

---
 CHANGES                                       | 26 +++++++++++++++++++
 .../pjsip_logger_improvements.txt             | 21 ---------------
 2 files changed, 26 insertions(+), 21 deletions(-)
 delete mode 100644 doc/CHANGES-staging/pjsip_logger_improvements.txt

diff --git a/CHANGES b/CHANGES
index 3b4857b835..102af6b15e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,32 @@
 ===
 ==============================================================================
 
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 13.33.0 to Asterisk 13.34.0 ----------
+------------------------------------------------------------------------------
+
+res_pjsip_logger
+------------------
+ * The PJSIP packet logger now has the following CLI commands:
+
+   pjsip set logger pcap <filename>
+
+   When used this will create a pcap file containing the incoming
+   and outgoing SIP packets, in unencrypted form.
+
+   pjsip set logger console <on / off>
+
+   This allows you to toggle logging to console on and off.
+
+   pjsip set logger host <IP/subnet mask> add
+
+   This allows you to add an additional IP address or subnet
+   mask to logging, allowing you to log multiple instead of
+   just a single IP address or all traffic.
+
+   The normal "pjsip set logger host" CLI command has also been
+   expanded to allow subnet masks as well.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 13.32.0 to Asterisk 13.33.0 ----------
 ------------------------------------------------------------------------------
diff --git a/doc/CHANGES-staging/pjsip_logger_improvements.txt b/doc/CHANGES-staging/pjsip_logger_improvements.txt
deleted file mode 100644
index 1a16be9a44..0000000000
--- a/doc/CHANGES-staging/pjsip_logger_improvements.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Subject: res_pjsip_logger
-
-The PJSIP packet logger now has the following CLI commands:
-
-pjsip set logger pcap <filename>
-
-When used this will create a pcap file containing the incoming
-and outgoing SIP packets, in unencrypted form.
-
-pjsip set logger console <on / off>
-
-This allows you to toggle logging to console on and off.
-
-pjsip set logger host <IP/subnet mask> add
-
-This allows you to add an additional IP address or subnet
-mask to logging, allowing you to log multiple instead of
-just a single IP address or all traffic.
-
-The normal "pjsip set logger host" CLI command has also been
-expanded to allow subnet masks as well.