Continuous Integration 77013e08b68 .......... [ZBXNEXT-826] automatic deployment of official Zabbix templates and media types 11 May 2021 ZBXNEXT-826 Continuous Integration 4220206be3f .......... [ZBX-1357] automatic translation file sync for trunk 11 May 2021 ZBX-1357 Sergejs Olonkins d0d2cf5de60 .......... [ZBXNEXT-826] updated release date [5.4.0rc1] 11 May 2021 ZBXNEXT-826 Continuous Integration 7638d153771 .......... [ZBXNEXT-826] updated 5.4.0rc1 ChangeLog entries 11 May 2021 ZBXNEXT-826 Continuous Integration b4ceb0d57a2 .......... [ZBXNEXT-826] updated 5.2.7rc1 ChangeLog entries 11 May 2021 ZBXNEXT-826 Continuous Integration 33a0207c3b1 .......... [ZBXNEXT-826] updated 5.0.12rc1 ChangeLog entries 11 May 2021 ZBXNEXT-826 Continuous Integration 78e941b6e82 .......... [ZBXNEXT-826] updated 4.0.31rc1 ChangeLog entries 11 May 2021 ZBXNEXT-826 Valdis Murzins 7c8559c92b7 M A......... [ZBXNEXT-6411] fixed UUID removal and addition when linking or unlinking template * commit 'd418a547d2fb690bb355048eb40dc522425ba66a':
A......... [ZBXNEXT-6411] minor improvement
A......... [ZBXNEXT-6411] fixed UUIDs generation for httptest items
A......... [ZBXNEXT-6411] fixed UUID removal from inherited web scenarios when unlinking a template
A......... [ZBXNEXT-6411] added UUIDs for unlinked web scenarios
A......... [ZBXNEXT-6411] added UUIDs for unlinked graphs... 11 May 2021 ZBXNEXT-6411 Alexander Vladishev d418a547d2f A......... [ZBXNEXT-6411] minor improvement 11 May 2021 ZBXNEXT-6411 Alexander Vladishev 2127f9775e9 A......... [ZBXNEXT-6411] fixed UUIDs generation for httptest items 11 May 2021 ZBXNEXT-6411 Valdis Murzins 3ed9f1fb767 A......... [ZBXNEXT-6411] fixed UUID removal from inherited web scenarios when unlinking a template 11 May 2021 ZBXNEXT-6411 Alexander Vladishev 34f29328899 A......... [ZBXNEXT-6411] added UUIDs for unlinked web scenarios 11 May 2021 ZBXNEXT-6411 Alexander Vladishev 0f9786fa414 A......... [ZBXNEXT-6411] added UUIDs for unlinked graphs and graph prototypes 11 May 2021 ZBXNEXT-6411 Valdis Murzins bbea6bb24a8 A......... [ZBXNEXT-6411] fixed UUID removal from inherited template entities when unlinking a template 11 May 2021 ZBXNEXT-6411 Alexander Vladishev faa935c2ae9 A......... [ZBXNEXT-6411] added UUIDs for unlinked triggers and trigger prototypes 11 May 2021 ZBXNEXT-6411 Alexander Vladishev cad4c8dc0ea A......... [ZBXNEXT-6411] added UUIDs for unlinked items, item prototypes, discovery rules and host prototypes 11 May 2021 ZBXNEXT-6411 Andris Mednis 14254738010 M ........S. [ZBXNEXT-6547] removed dead code (Coverity CID 331473) * commit 'cbd95589d5f86a90d104f42bee4c2452af6baa0e':
........S. [ZBXNEXT-6547] removed dead code (Coverity CID 331473) 11 May 2021 ZBXNEXT-6547 Alexander Vladishev 8d6dad28a24 A.F....... [ZBXNEXT-6452] added escaping of the backslashes in the quoted function parameters 11 May 2021 ZBXNEXT-6452 Alex Kalimulin de0dd3a4e0e ....I..... [ZBXNEXT-6411] fixed formatting in trigger uuid upgrade patches 11 May 2021 ZBXNEXT-6411 Anton Fayantsev 1c00fc01450 M .........T [ZBXNEXT-6411] updated all template files to support new uniqueness criteria * commit 'dc32eb4ec8f7a4107a3b75188af292bc9016b13f':
.........T [ZBXNEXT-6411] updated all template files to support new uniqueness criteria 11 May 2021 ZBXNEXT-6411 Anton Fayantsev dc32eb4ec8f .........T [ZBXNEXT-6411] updated all template files to support new uniqueness criteria 11 May 2021 ZBXNEXT-6411 Valdis Murzins 6b37e37b24c A......... [ZBXNEXT-6411] fixed dependent item import with uuid 11 May 2021 ZBXNEXT-6411 Andris Zeila 01adc790365 .......P.. [ZBX-19324] fixed possible deadlocks between configuration and history syncers on proxy Merge in ZBX/zabbix from feature/ZBX-19324-5.0 to release/5.0
* commit 'ac8502c31cf609b7a5df6607ed1c2195478ba6ca':
.......P.. [ZBX-19324] fixed possible deadlocks between configuration and history syncers on proxy
.......P.. [ZBX-19324] style fixes and removed redundant code
.D........ [ZBX-19324] added changelog entry
.......P.. [ZBX-19324] fixed possible deadlocks between configurati... 11 May 2021 ZBX-19324 Alexander Vladishev 10785c31c2f .......... [ZBXNEXT-6411] fixed field sorder in schema.inc.php 11 May 2021 ZBXNEXT-6411 Anton Fayantsev d6a68d4587b M .........T [ZBXNEXT-6411] updated all template files to support new uniqueness criteria * commit 'a8967564a1542700c312bc7840752988319c44b9':
.........T [ZBXNEXT-6411] updated all template files to support new uniqueness criteria 11 May 2021 ZBXNEXT-6411 Alex Kalimulin 0c8d453af28 ....I..... [ZBXNEXT-6411] fixed function parameters for uuid seed; fixed memory leaks 11 May 2021 ZBXNEXT-6411 Anton Fayantsev a8967564a15 .........T [ZBXNEXT-6411] updated all template files to support new uniqueness criteria 11 May 2021 ZBXNEXT-6411 Alexander Vladishev 062c6a144f2 .......... [ZBXNEXT-6411] fixed order of the fields 10 May 2021 ZBXNEXT-6411 Alexander Vladishev 627329cd956 .......... [ZBXNEXT-6411] removed trailing commas at the end of arrays 10 May 2021 ZBXNEXT-6411 Valdis Murzins bcbc7e67161 M A.F.I...S. [ZBXNEXT-6411] added uniqueness criteria in template elements and added option to compare templates before importing * commit '3d8fef5b8418e66e05747abeef814ab1f7f94c9d': (93 commits)
.......... [ZBXNEXT-6411] removed conversion of SNMPv1 template suffix for seeds; updated templates.tmpl
.......... [ZBXNEXT-6411] fixed unit tests
.......... [ZBXNEXT-6411] fixed unit tests
A......... [ZBXNEXT-6411] fixed template renaming for UUID generation; fixed graph UUID generation
.......... [ZBXNEXT-6411] updat... 10 May 2021 ZBXNEXT-6411 Alex Kalimulin 3d8fef5b841 .......... [ZBXNEXT-6411] removed conversion of SNMPv1 template suffix for seeds; updated templates.tmpl 10 May 2021 ZBXNEXT-6411 Valdis Murzins e2f2e6e24fc .......... [ZBXNEXT-6411] fixed unit tests 10 May 2021 ZBXNEXT-6411 Valdis Murzins 2b0e21bf614 .......... [ZBXNEXT-6411] fixed unit tests 10 May 2021 ZBXNEXT-6411 Valdis Murzins 547d16cf62c A......... [ZBXNEXT-6411] fixed template renaming for UUID generation; fixed graph UUID generation 10 May 2021 ZBXNEXT-6411 Alex Kalimulin 6b0795a027c .......... [ZBXNEXT-6411] updated templates.tmpl 10 May 2021 ZBXNEXT-6411 Aleksandrs Subins 18e99dcc3b4 .......... [ZBXNEXT-6411] fixed unit tests 10 May 2021 ZBXNEXT-6411 Aleksandrs Subins 99d2758f4dd .......... [ZBXNEXT-6411] fixed unit tests 10 May 2021 ZBXNEXT-6411 Aleksandrs Subins 2c7a0652562 .......... [ZBXNEXT-6411] fixed unit tests 10 May 2021 ZBXNEXT-6411 Aleksandrs Subins 10ec9928bcf .......... [ZBXNEXT-6411] fixed unit tests 10 May 2021 ZBXNEXT-6411 Aleksandrs Subins 6884c1c7a2e M A...I..... [ZBXNEXT-6411] updated to latest from master; resolved conflicts in: # create/src/schema.tmpl
# src/libs/zbxdbupgrade/dbupgrade_5030.c
# templates/app/activemq_jmx/template_app_activemq_jmx.yaml
# templates/app/apache_agent/template_app_apache_agent.yaml
# templates/app/apache_http/template_app_apache_http.yaml
# templates/app/aranet/aranet_cloud.yaml
# templates/app/ceph_agent2/template_app_ceph_agent2.yaml
# templates/app/docker/template_app_docker.yaml
# temp... 10 May 2021 ZBXNEXT-6411 Valdis Murzins 1ca32e7b027 ..F....... [ZBXNEXT-6411] fixed UUID compariosn in import, if they would be passed in uppercase 08 May 2021 ZBXNEXT-6411 Valdis Murzins a292b777ae6 ..F....... [ZBXNEXT-6411] fixed TOC name selection for templates and host prototypes 08 May 2021 ZBXNEXT-6411 Valdis Murzins 92af08ce00b A......... [ZBXNEXT-6411] fixed simple trigger prototype comparions by UUID in configuration.importcompare 08 May 2021 ZBXNEXT-6411 Aleksandrs Subins 650a786a68f A......... [ZBXNEXT-6411] fixed code style 10 May 2021 ZBXNEXT-6411 Aleksandrs Subins 94b00a2a9d9 M .......... [ZBXNEXT-6411] updated to latest feature/ZBXNEXT-6411-5.3; no conflicts 10 May 2021 ZBXNEXT-6411 Aleksandrs Subins e222c02f214 M A.F.I...S. [ZBXNEXT-6411] updated to latest master; resolved conflicts in : # create/src/schema.tmpl
# create/src/templates.tmpl - ours for now
# include/zbxserver.h
# src/libs/zbxdbcache/dbconfig.c
# src/libs/zbxdbupgrade/dbupgrade_5030.c
# src/libs/zbxserver/expression.c
# ui/include/classes/import/CImportDataAdapter.php
# ui/include/classes/import/CConfigurationImport.php
# ui/include/classes/import/CConfigurationImportcompare.php
# ui/include/classes/import/impor... 10 May 2021 ZBXNEXT-6411 Gregory Chalenko afed3e3c366 A.F....... [ZBXNEXT-114,ZBXNEXT-6572] fixed incorrect flags; fixed method description 10 May 2021 2 Jira issuesAlexander Vladishev 1d75c3932a0 .......... [ZBXNEXT-114] removed trailing commas at the end of arrays 10 May 2021 ZBXNEXT-114 Alexander Vladishev 26def599e0c .......... [ZBXNEXT-114] updated unit tests 10 May 2021 ZBXNEXT-114 Andris Zeila 7c352989d55 M ........S. [ZBXNEXT-6452] fixed ant build and aggregate check sql queries Merge in ZBX/zabbix from feature/ZBXNEXT-6452-5.3 to master
* commit '78258ef265639beb76523906e294575950754f47':
........S. [ZBXNEXT-6452] reworked syntax of generated sql 'false' condition to match frontend
........S. [ZBXNEXT-6452] fixed typo
........S. [ZBXNEXT-6452] fixed aggregate check sql query with Oracle
........S. [ZBXNEXT-6452] fixed ant build 10 May 2021 ZBXNEXT-6452 
