Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiks Kronkalns <miks.kronkalns@zabbix.com>2021-12-13 13:46:53 +0300
committerMiks Kronkalns <miks.kronkalns@zabbix.com>2021-12-13 13:46:53 +0300
commitfbd156723212ce02025f6156ef8255673bb27a15 (patch)
tree5cd06bd0dd8b25d8989b11cc404a2e142bb42373 /ChangeLog.d
parent983420f1c9d30c42413ed7f3b7cda11e6212bc3c (diff)
parent512e45d3cb0f017017df139bbd00a522b9bdeea8 (diff)
.......... [ZBX-20270] updated to latest from master. Resolved conflicts in:
- ui/include/classes/widgets/views/widget.geomap.form.view.php
Diffstat (limited to 'ChangeLog.d')
-rw-r--r--ChangeLog.d/bugfix/ZBX-183891
-rw-r--r--ChangeLog.d/bugfix/ZBX-197041
-rw-r--r--ChangeLog.d/bugfix/ZBX-200601
-rw-r--r--ChangeLog.d/bugfix/ZBX-200751
-rw-r--r--ChangeLog.d/bugfix/ZBX-202401
-rw-r--r--ChangeLog.d/bugfix/ZBX-203281
-rw-r--r--ChangeLog.d/feature/ZBXNEXT-70851
7 files changed, 1 insertions, 6 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-18389 b/ChangeLog.d/bugfix/ZBX-18389
deleted file mode 100644
index 18c155b9184..00000000000
--- a/ChangeLog.d/bugfix/ZBX-18389
+++ /dev/null
@@ -1 +0,0 @@
-.........T [ZBX-18389] fixed sql query for 32 and 64 bit xids postgresql versions in postgresql by user parameters template (vkhaliev)
diff --git a/ChangeLog.d/bugfix/ZBX-19704 b/ChangeLog.d/bugfix/ZBX-19704
deleted file mode 100644
index de5d1379423..00000000000
--- a/ChangeLog.d/bugfix/ZBX-19704
+++ /dev/null
@@ -1 +0,0 @@
-.........T [ZBX-19704] fixed item pattern in "Zabbix server health" dashboard (abakaldin)
diff --git a/ChangeLog.d/bugfix/ZBX-20060 b/ChangeLog.d/bugfix/ZBX-20060
deleted file mode 100644
index c2d1dbf8952..00000000000
--- a/ChangeLog.d/bugfix/ZBX-20060
+++ /dev/null
@@ -1 +0,0 @@
-.........T [ZBX-20060] fixed trigger expression for memory monitoring in F5 Big-IP SNMP template (abakaldin)
diff --git a/ChangeLog.d/bugfix/ZBX-20075 b/ChangeLog.d/bugfix/ZBX-20075
deleted file mode 100644
index 1e2d01bfafd..00000000000
--- a/ChangeLog.d/bugfix/ZBX-20075
+++ /dev/null
@@ -1 +0,0 @@
-.........T [ZBX-20075] fixed trigger expression for certificate monitoring in F5 Big-IP SNMP template (abakaldin)
diff --git a/ChangeLog.d/bugfix/ZBX-20240 b/ChangeLog.d/bugfix/ZBX-20240
deleted file mode 100644
index 439b133f897..00000000000
--- a/ChangeLog.d/bugfix/ZBX-20240
+++ /dev/null
@@ -1 +0,0 @@
-.......... [ZBX-20240] added integration tests for trigger state (ssimonenko)
diff --git a/ChangeLog.d/bugfix/ZBX-20328 b/ChangeLog.d/bugfix/ZBX-20328
new file mode 100644
index 00000000000..bf44aea947d
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20328
@@ -0,0 +1 @@
+A......... [ZBX-20328] fixed incomplete inheritance of items, item prototypes, lld rules, host prototypes, when user with type "Admin" was edited them on template which is linked to non-permitted for him templates or hosts (vmaksimovs)
diff --git a/ChangeLog.d/feature/ZBXNEXT-7085 b/ChangeLog.d/feature/ZBXNEXT-7085
deleted file mode 100644
index 11e051f4eb2..00000000000
--- a/ChangeLog.d/feature/ZBXNEXT-7085
+++ /dev/null
@@ -1 +0,0 @@
-..F.I..... [ZBXNEXT-7085] extended 'formula' field in 'actions' table from 255 to 1024 characters (akozlovs, rlataria)