From 06f8de918dfa7549daf56b641d300c838f1145e3 Mon Sep 17 00:00:00 2001
From: Tomas Cejka <cejkat@cesnet.cz>
Date: Mon, 12 Dec 2022 01:02:24 +0100
Subject: [PATCH] ipfixprobe: increased version, updated ChangeLog, released
 RPM package

---
 ChangeLog    |  5 +++++
 NEWS         | 11 +++++++++++
 configure.ac |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 11b4b806..d5c46889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-12-12 ipfixprobe-4.7.1
+	* http: Removed trailing '\r' from HTTP exported fields
+	* tcp: fixed seq&ack tracking
+	* dpdk: reworked plugin
+
 2022-10-03 ipfixprobe-4.7.0
 	* dpdk: support for multi-queues
 	* dpdk: improved config file and init script
diff --git a/NEWS b/NEWS
index 5eb15f94..ed2a971f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+2022-12-05 (Karel Hynek): Merge pull request #110 from CESNET/tcp_seq_ack_fix
+2022-12-05 (Tomas Cejka): Merge pull request #109 from CESNET/HTTPS_plugin_fix
+2022-12-05 (Karel Hynek): FIX: Parsing TCP SEQ and TCP ACK numbers
+2022-11-25 (Karel Hynek): BUGFIX: Removed trailing '\r' from HTTP exported fields
+2022-11-24 (SiskaPavel): Merge pull request #108 from CESNET/dpdk-rework
+2022-11-22 (xsiska12): dpdk: updated README
+2022-11-22 (xsiska12): dpdk - rework dpdk plugin
+2022-10-14 (Tomas Cejka): Merge pull request #105 from CESNET/dpdk-older-version-support
+2022-10-03 (xsiska12): dpdk: support dpdk version < 21.11
+2022-10-03 (SiskaPavel): Merge pull request #104 from CESNET/new_version
+
 2022-10-03 (Tomas Cejka): Merge pull request #103 from CESNET/dpdk-queues
 2022-10-03 (xsiska12): dpdk: Updated README.md
 2022-10-03 (xsiska12): dpdk: added DPDK into daemon wrapper and example config
diff --git a/configure.ac b/configure.ac
index 1f9166d0..b51517fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([ipfixprobe], [4.7.0], [nemea@cesnet.cz])
+AC_INIT([ipfixprobe], [4.7.1], [nemea@cesnet.cz])
 
 AC_CONFIG_SRCDIR([main.cpp])
 AC_CONFIG_HEADERS([config.h])