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

13 files changed, 12 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index b69ac4c6989..e0239e8605f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,22 @@
 Changes for 6.0.11rc1
 
 New features:
+.........T [ZBX-21588] optimized template k8s nodes by http (egordymov)
+.......PS. [ZBXNEXT-8040] added object based json parsing and jsonpath optimizations (wiper)
+.........T [ZBXNEXT-7949] added a suffix "by" of template names (egordymov)
+.........T [ZBX-20478] fixed script k8s cluster state (egordymov)
 .........T [ZBXNEXT-6844] added Cisco Meraki template (abiba, vkhaliev)
 .......PS. [ZBXNEXT-8009] added jsonpath optimizations (wiper)
 
 Bug fixes:
+........S. [ZBX-19813] reworked inteface updates in template linking and lld (wiper)
+..F....... [ZBX-20320] fixed order of checkboxes in user role view; added vertical display to CCheckBoxList; removed CSeverityCheckBoxList (epulke)
+.......... [ZBX-21869] fixed database upgrade from 5.0 on setups requiring primary keys for tables (wiper)
+.........T [ZBX-21620] changed update interval for passwd checksum item in OS templates to 15m (drasihov)
+........S. [ZBX-21616] fixed error due to non-existent macros in custom expressions (dgoloscapov, wiper)
+........S. [ZBX-21825] improved history syncer performance (vso)
+.......PS. [ZBX-21786] fixed 'invalid timeout' error occurring after script item parameters removal (asestakovs)
+...G...... [ZBX-21823] fixed vfs.fs.inode and vfs.fs.get to handle file systems with zero total inodes count (asestakovs)
 ........S. [ZBX-21765] removed HTTP header "Accept-Encoding" from defaults in a web scenario step request (dimir)
 .......... [ZBX-21715] fixed Zabbix JS (zabbix_js) crash when parsing short version of "timeout" option -t (dimir)
 ........S. [ZBX-21655] fixed VMware datastore discovery to not return same datastore multiple times (asestakovs)
diff --git a/ChangeLog.d/bugfix/ZBX-19813 b/ChangeLog.d/bugfix/ZBX-19813
deleted file mode 100644
index bc3de5fb538..00000000000
--- a/ChangeLog.d/bugfix/ZBX-19813
+++ /dev/null
@@ -1 +0,0 @@
-........S. [ZBX-19813] reworked inteface updates in template linking and lld (wiper)
diff --git a/ChangeLog.d/bugfix/ZBX-20320 b/ChangeLog.d/bugfix/ZBX-20320
deleted file mode 100644
index fba1085ac84..00000000000
--- a/ChangeLog.d/bugfix/ZBX-20320
+++ /dev/null
@@ -1 +0,0 @@
-..F....... [ZBX-20320] fixed order of checkboxes in user role view; added vertical display to CCheckBoxList; removed CSeverityCheckBoxList (epulke)
diff --git a/ChangeLog.d/bugfix/ZBX-21616 b/ChangeLog.d/bugfix/ZBX-21616
deleted file mode 100644
index fcabe90b876..00000000000
--- a/ChangeLog.d/bugfix/ZBX-21616
+++ /dev/null
@@ -1 +0,0 @@
-........S. [ZBX-21616] fixed error due to non-existent macros in custom expressions (dgoloscapov, wiper)
diff --git a/ChangeLog.d/bugfix/ZBX-21620 b/ChangeLog.d/bugfix/ZBX-21620
deleted file mode 100644
index 7c67d5e77d8..00000000000
--- a/ChangeLog.d/bugfix/ZBX-21620
+++ /dev/null
@@ -1 +0,0 @@
-.........T [ZBX-21620] changed update interval for passwd checksum item in OS templates to 15m (drasihov)
diff --git a/ChangeLog.d/bugfix/ZBX-21786 b/ChangeLog.d/bugfix/ZBX-21786
deleted file mode 100644
index b49e12c1d14..00000000000
--- a/ChangeLog.d/bugfix/ZBX-21786
+++ /dev/null
@@ -1 +0,0 @@
-.......PS. [ZBX-21786] fixed 'invalid timeout' error occurring after script item parameters removal (asestakovs)
diff --git a/ChangeLog.d/bugfix/ZBX-21823 b/ChangeLog.d/bugfix/ZBX-21823
deleted file mode 100644
index d62c47a2281..00000000000
--- a/ChangeLog.d/bugfix/ZBX-21823
+++ /dev/null
@@ -1 +0,0 @@
-...G...... [ZBX-21823] fixed vfs.fs.inode and vfs.fs.get to handle file systems with zero total inodes count (asestakovs)
diff --git a/ChangeLog.d/bugfix/ZBX-21825 b/ChangeLog.d/bugfix/ZBX-21825
deleted file mode 100644
index f1e98ad97d0..00000000000
--- a/ChangeLog.d/bugfix/ZBX-21825
+++ /dev/null
@@ -1 +0,0 @@
-........S. [ZBX-21825] improved history syncer performance (vso)
diff --git a/ChangeLog.d/bugfix/ZBX-21869 b/ChangeLog.d/bugfix/ZBX-21869
deleted file mode 100644
index 3591d2cbc09..00000000000
--- a/ChangeLog.d/bugfix/ZBX-21869
+++ /dev/null
@@ -1 +0,0 @@
-.......... [ZBX-21869] fixed database upgrade from 5.0 on setups requiring primary keys for tables (wiper)
diff --git a/ChangeLog.d/feature/ZBX-20478 b/ChangeLog.d/feature/ZBX-20478
deleted file mode 100644
index eb007242743..00000000000
--- a/ChangeLog.d/feature/ZBX-20478
+++ /dev/null
@@ -1 +0,0 @@
-.........T [ZBX-20478] fixed script k8s cluster state (egordymov)
diff --git a/ChangeLog.d/feature/ZBX-21588 b/ChangeLog.d/feature/ZBX-21588
deleted file mode 100644
index f0f2aa394d9..00000000000
--- a/ChangeLog.d/feature/ZBX-21588
+++ /dev/null
@@ -1 +0,0 @@
-.........T [ZBX-21588] optimized template k8s nodes by http (egordymov)
diff --git a/ChangeLog.d/feature/ZBXNEXT-7949 b/ChangeLog.d/feature/ZBXNEXT-7949
deleted file mode 100644
index 05200cba95b..00000000000
--- a/ChangeLog.d/feature/ZBXNEXT-7949
+++ /dev/null
@@ -1 +0,0 @@
-.........T [ZBXNEXT-7949] added a suffix "by" of template names (egordymov)
diff --git a/ChangeLog.d/feature/ZBXNEXT-8040 b/ChangeLog.d/feature/ZBXNEXT-8040
deleted file mode 100644
index 15238ae2c93..00000000000
--- a/ChangeLog.d/feature/ZBXNEXT-8040
+++ /dev/null
@@ -1 +0,0 @@
-.......PS. [ZBXNEXT-8040] added object based json parsing and jsonpath optimizations (wiper)