........S. [ZBX-21616] resolved conflict

13 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog.d/bugfix/ZBX-20296 b/ChangeLog.d/bugfix/ZBX-20296
new file mode 100644
index 00000000000..2e9f86c3385
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20296
@@ -0,0 +1 @@
+.........T [ZBX-20296] fixed swap trigger function for windows os and modules by Zabbix agent templates (atocko)
diff --git a/ChangeLog.d/bugfix/ZBX-20392 b/ChangeLog.d/bugfix/ZBX-20392
new file mode 100644
index 00000000000..fa902b9982b
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20392
@@ -0,0 +1 @@
+.........T [ZBX-20392] added close/ack/unack of events for OPSgenie media (atocko)
diff --git a/ChangeLog.d/bugfix/ZBX-21000 b/ChangeLog.d/bugfix/ZBX-21000
new file mode 100644
index 00000000000..ae161d56403
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21000
@@ -0,0 +1 @@
+..F....... [ZBX-21000] fixed possibility to update host interface on items from templates (dpetra)
diff --git a/ChangeLog.d/bugfix/ZBX-21025 b/ChangeLog.d/bugfix/ZBX-21025
new file mode 100644
index 00000000000..e782db30c5f
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21025
@@ -0,0 +1 @@
+........S. [ZBX-21025] fixed the allowed argument range limits for char() trigger function (kprutkovs)
diff --git a/ChangeLog.d/bugfix/ZBX-21227 b/ChangeLog.d/bugfix/ZBX-21227
new file mode 100644
index 00000000000..e69934fe56a
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21227
@@ -0,0 +1 @@
+...G...... [ZBX-21227] fixed Zabbix agent to log received service control commands (vso)
diff --git a/ChangeLog.d/bugfix/ZBX-21456 b/ChangeLog.d/bugfix/ZBX-21456
new file mode 100644
index 00000000000..354ffa13951
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21456
@@ -0,0 +1 @@
+...G...... [ZBX-21456] fixed net.tcp.socket.count and net.udp.socket.count problem on Zabbix agent 2 when ipv6 is disabled (dgoloscapov)
diff --git a/ChangeLog.d/bugfix/ZBX-21466 b/ChangeLog.d/bugfix/ZBX-21466
deleted file mode 100644
index b6d27e0d07a..00000000000
--- a/ChangeLog.d/bugfix/ZBX-21466
+++ /dev/null
@@ -1 +0,0 @@
-...G...... [ZBX-21466] fixed race condition in Zabbix agent 2 leading to permanently stuck mount reads (arimdjonoks)
diff --git a/ChangeLog.d/bugfix/ZBX-21484 b/ChangeLog.d/bugfix/ZBX-21484
new file mode 100644
index 00000000000..77b1d5e20c5
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21484
@@ -0,0 +1 @@
+.........T [ZBX-21484] updated documentation for templates SMART by Zabbix agent 2 (atocko)
diff --git a/ChangeLog.d/bugfix/ZBX-21510 b/ChangeLog.d/bugfix/ZBX-21510
new file mode 100644
index 00000000000..ce1c671d84f
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21510
@@ -0,0 +1 @@
+........S. [ZBX-21510] made NodeAddress use ListenIP and ListenPort if not explicitly specified (kprutkovs)
diff --git a/ChangeLog.d/bugfix/ZBX-21532 b/ChangeLog.d/bugfix/ZBX-21532
new file mode 100644
index 00000000000..9e8eacbe634
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21532
@@ -0,0 +1 @@
+..F....... [ZBX-21532] fixed missing inherited tags for templated triggers in edit form, tag tab (dpetra)
diff --git a/ChangeLog.d/bugfix/ZBX-21537 b/ChangeLog.d/bugfix/ZBX-21537
new file mode 100644
index 00000000000..86fe8dc2f96
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21537
@@ -0,0 +1 @@
+........S. [ZBX-21537] fixed history syncers being stuck waiting on system information being collected (vso)
diff --git a/ChangeLog.d/bugfix/ZBX-21725 b/ChangeLog.d/bugfix/ZBX-21725
new file mode 100644
index 00000000000..a9576620368
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21725
@@ -0,0 +1 @@
+.......PS. [ZBX-21725] fixed configuration cache shared memory leak when removing vault macros (wiper)
diff --git a/ChangeLog.d/feature/ZBXNEXT-7948 b/ChangeLog.d/feature/ZBXNEXT-7948
new file mode 100644
index 00000000000..27cce001b4e
--- /dev/null
+++ b/ChangeLog.d/feature/ZBXNEXT-7948
@@ -0,0 +1 @@
+.......PS. [ZBXNEXT-7948] optimized preprocessing manager cache refresh (wiper)