.......... [ZBXNEXT-826] updated 6.0.6rc1 ChangeLog entries

8 files changed, 7 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f617168b2f..5cbf601b6b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Changes for 6.0.6rc1
 
 New features:
+.......PS. [ZBXNEXT-7813] updated MariaDB maximum supported version to 10.7 (arimdjonoks)
 ..F....... [ZBXNEXT-7769] added support of PHP 8.1 to LDAP authentication (gcalenko)
 ..F....... [ZBXNEXT-7722] fixed runtime errors when using Zabbix with PHP 8.1 (agriscenko)
 ...G.....T [ZBXNEXT-6891] removed mongodb implementation, updated template to work with new plugin (esneiders, ychukina)
@@ -8,6 +9,12 @@ New features:
 .........T [ZBXNEXT-7630] added templates for HPE MSA 2060 and MSA 2040 (drasihov)
 
 Bug fixes:
+........S. [ZBX-21145] changed host, item and trigger tag merging logic during template linking and LLD to reduce database updates (wiper)
+..F....PS. [ZBX-20638] fixed handling of db version higher than supported (agriscenko, dgoloscapov)
+........S. [ZBX-20750] fixed excessive escaping of special characters in audit log details, triggers and graphs (akozlovs)
+..F....... [ZBX-21015] fixed web scenario tags disappearing from Monitoring -> Hosts -> Web scenario on page auto refresh (agriscenko)
+..F....... [ZBX-20960] fixed SVG graph widget throwing error when attempting to plot item with valid user macro defined in history storage period (agriscenko)
+..F....... [ZBX-20965] fixed positioning of change indicator in Item value widget (dpetra)
 ..F.....S. [ZBX-20994] fixed access limitation for Oracle DB to list tables accessible to the user (asestakovs)
 .......PS. [ZBX-21123] fixed crash when VMware VC was not available at the first moment when starting zabbix_server (MVekslers)
 ........S. [ZBX-21044] fixed javascript preprocessing output conversion to utf-8 (kprutkovs)
diff --git a/ChangeLog.d/bugfix/ZBX-20638 b/ChangeLog.d/bugfix/ZBX-20638
deleted file mode 100644
index e304073e81e..00000000000
--- a/ChangeLog.d/bugfix/ZBX-20638
+++ /dev/null
@@ -1 +0,0 @@
-..F....PS. [ZBX-20638] fixed handling of db version higher than supported (agriscenko, dgoloscapov)
diff --git a/ChangeLog.d/bugfix/ZBX-20750 b/ChangeLog.d/bugfix/ZBX-20750
deleted file mode 100644
index e09e3cd8981..00000000000
--- a/ChangeLog.d/bugfix/ZBX-20750
+++ /dev/null
@@ -1 +0,0 @@
-........S. [ZBX-20750] fixed excessive escaping of special characters in audit log details, triggers and graphs (akozlovs)
diff --git a/ChangeLog.d/bugfix/ZBX-20960 b/ChangeLog.d/bugfix/ZBX-20960
deleted file mode 100644
index 8c0c78d7e1b..00000000000
--- a/ChangeLog.d/bugfix/ZBX-20960
+++ /dev/null
@@ -1 +0,0 @@
-..F....... [ZBX-20960] fixed SVG graph widget throwing error when attempting to plot item with valid user macro defined in history storage period (agriscenko)
diff --git a/ChangeLog.d/bugfix/ZBX-20965 b/ChangeLog.d/bugfix/ZBX-20965
deleted file mode 100644
index 08dbc1423b1..00000000000
--- a/ChangeLog.d/bugfix/ZBX-20965
+++ /dev/null
@@ -1 +0,0 @@
-..F....... [ZBX-20965] fixed positioning of change indicator in Item value widget (dpetra)
diff --git a/ChangeLog.d/bugfix/ZBX-21015 b/ChangeLog.d/bugfix/ZBX-21015
deleted file mode 100644
index d1f20ff45f6..00000000000
--- a/ChangeLog.d/bugfix/ZBX-21015
+++ /dev/null
@@ -1 +0,0 @@
-..F....... [ZBX-21015] fixed web scenario tags disappearing from Monitoring -> Hosts -> Web scenario on page auto refresh (agriscenko)
diff --git a/ChangeLog.d/bugfix/ZBX-21145 b/ChangeLog.d/bugfix/ZBX-21145
deleted file mode 100644
index f7fe5e8c5fd..00000000000
--- a/ChangeLog.d/bugfix/ZBX-21145
+++ /dev/null
@@ -1 +0,0 @@
-........S. [ZBX-21145] changed host, item and trigger tag merging logic during template linking and LLD to reduce database updates (wiper)
diff --git a/ChangeLog.d/feature/ZBXNEXT-7813 b/ChangeLog.d/feature/ZBXNEXT-7813
deleted file mode 100644
index 32d23078286..00000000000
--- a/ChangeLog.d/feature/ZBXNEXT-7813
+++ /dev/null
@@ -1 +0,0 @@
-.......PS. [ZBXNEXT-7813] updated MariaDB maximum supported version to 10.7 (arimdjonoks)