Andrejs Kozlovs b5ed8f5d0d3 .......... [DEV-2142] refactored libzbxdbhigh by separation to higher and lower parts 26 Sep 2022 DEV-2142 Dmitrijs Goloscapovs 4450c2034a8 .......... [ZBXNEXT-7122] reverted merge to wrong branch This reverts commit 331ad12a1e9a53e8325922ba9fd56be0c442f575. 21 Sep 2022 ZBXNEXT-7122 Dmitrijs Goloscapovs 331ad12a1e9 .......... [ZBXNEXT-7122] merge 22 Dec 2021 ZBXNEXT-7122 Sergejs Maklakovs e4de8926d82 .......... [ZBXNEXT-826] update changelog master 21 Sep 2022 ZBXNEXT-826 Sergejs Maklakovs 3e07dc09f5f .......... [ZBXNEXT-826] updated changelog for master 21 Sep 2022 ZBXNEXT-826 Armands Arseniuss Skolmeisters 58b6fca7d5e M ...G....S. [DEV-2260] removed redundant casts from C code * commit 'c9f04fa56640c31587e0f77ab34073cef9aad0b4':
...G....S. [DEV-2260] removed redundant parentheses
...G....S. [DEV-2260] readability improvement
...G....S. [DEV-2260] readability improvement
...G....S. [DEV-2260] remove redundant casts from C code 20 Sep 2022 DEV-2260 Juris Lambda e9f86a30c95 .......... [ZBXNEXT-7931] removed obsolete comment 20 Sep 2022 ZBXNEXT-7931 Juris Lambda bcd1cf1cff2 .......... [ZBXNEXT-7931] dropped unused return variable 20 Sep 2022 ZBXNEXT-7931 Armands Arseniuss Skolmeisters c9f04fa5664 M ...G....S. [DEV-2260] updated to the latest master 20 Sep 2022 DEV-2260 Juris Lambda 53d99453391 M .......... [ZBXNEXT-7931] fixed botched conflict resolution 20 Sep 2022 ZBXNEXT-7931 Juris Lambda d3ac6a12179 ........S. [ZBXNEXT-7931] added back a missing header 20 Sep 2022 ZBXNEXT-7931 Juris Lambda 2832bbd3a41 M .......... [ZBXNEXT-7931] synced with master; no conflicts 20 Sep 2022 ZBXNEXT-7931 Juris Lambda 6b286ce21af ....I..... [ZBXNEXT-7931] removed items that came back in a merge The previous sync with master in eaf40821 accidentally left two entries
in graphs_items that referred to non-existing items. This fixes that. 19 Sep 2022 ZBXNEXT-7931 Armands Arseniuss Skolmeisters 860cf16335f ...G....S. [DEV-2260] removed redundant parentheses 19 Sep 2022 DEV-2260 Juris Lambda 8ba58a4899f .......... [ZBXNEXT-7931] fixed botched conflict resolution Accidentally reinstated code from prior to the changes in 6a6b9c9c,
678b18af and f5a352ea, during eaf40821. This should resolve that. 19 Sep 2022 ZBXNEXT-7931 Sergejs Maklakovs 5b9ab82fe55 .......... [ZBXNEXT-826] updated changelog 19 Sep 2022 ZBXNEXT-826 Continuous Integration 0c4261926e5 .......... [ZBXNEXT-826] updated 6.4.0alpha2 ChangeLog entries 19 Sep 2022 ZBXNEXT-826 Armands Arseniuss Skolmeisters d2d967ff20b ...G....S. [DEV-2260] readability improvement 19 Sep 2022 DEV-2260 Armands Arseniuss Skolmeisters 361bfe8213b ...G....S. [DEV-2260] readability improvement 19 Sep 2022 DEV-2260 Juris Lambda 87a6138401c M .......PS. [ZBXNEXT-7931] removed heartbeats support from Zabbix proxy 19 Sep 2022 ZBXNEXT-7931 Juris Lambda eaf40821a24 M .......... [ZBXNEXT-7931] synced with master; with conflicts templates.tmpl had some items added in the mean while and some ids
shifted. proxy.c had some functions change their names and/or
signatures. similarly, trapper.c had some functions changed their
signatures. 19 Sep 2022 ZBXNEXT-7931 Vladislavs Sokurenko e947ccf2c4e ........S. [ZBX-21664] fixed Zabbix server crashing during database upgrade when converting service times and there is downtime inside uptime Merge in ZBX/zabbix from feature/ZBX-21664-6.0 to release/6.0
* commit '6a020eb643d214093f0f0b7f3b86cdd93237020c':
........S. [ZBX-21664] fixed Zabbix server crashing during database upgrade when converting service times and there is downtime inside uptime
........S. [ZBX-21664] fixed Zabbix server crashing during database upgrade when converting service times and there is downtime inside ... 19 Sep 2022 ZBX-21664 Mihails Prihodko 9105284a92d M A.F.I..PST [ZBXNEXT-2557] added support of Zabbix proxies with legacy version * commit '614c263f7c0619dfa24680ba01698879ab8a1a01': (90 commits)
.......... [ZBXNEXT-2557] fixed hosts backup
.......... [ZBXNEXT-2557] fixed after review
.......PS. [ZBXNEXT-2557] fixed generation of templates.tmpl
.......... [ZBXNEXT-2557,ZBXNEXT-7826] removed trailing comma
.......... [ZBXNEXT-2557,ZBXNEXT-7826] removed trailing commas
.......... [ZBXNEXT-2557] deleted trailing ... 19 Sep 2022 2 Jira issuesMihails Prihodko 614c263f7c0 M .......... [ZBXNEXT-2557] merged with the latest master 19 Sep 2022 ZBXNEXT-2557 Sergejs Maklakovs 5c9446abd40 .......... [ZBXNEXT-826] updated changelog for master 19 Sep 2022 ZBXNEXT-826 Continuous Integration bde4a926cbc .......... [ZBXNEXT-826] updated 6.4.0alpha2 ChangeLog entries 16 Sep 2022 ZBXNEXT-826 Continuous Integration 96e4bd704c1 .......... [ZBX-1357] automatic update of translation strings 16 Sep 2022 ZBX-1357 Larisa Grigorjeva 26cde6a4c42 .......... [ZBXNEXT-2557] fixed hosts backup 16 Sep 2022 ZBXNEXT-2557 Larisa Grigorjeva 372c478ad9d .......... [ZBXNEXT-2557] fixed after review 16 Sep 2022 ZBXNEXT-2557 Mihails Prihodko 0bfd5c68245 .......PS. [ZBXNEXT-2557] fixed generation of templates.tmpl 16 Sep 2022 ZBXNEXT-2557 Andrejs Griščenko 7bace81e7f9 .......... [ZBXNEXT-2557,ZBXNEXT-7826] removed trailing comma 16 Sep 2022 2 Jira issuesAndrejs Griščenko 45e44e4fc3b .......... [ZBXNEXT-2557,ZBXNEXT-7826] removed trailing commas 16 Sep 2022 2 Jira issuesLarisa Grigorjeva 397e76c2dd5 .......... [ZBXNEXT-2557] deleted trailing comma 16 Sep 2022 ZBXNEXT-2557 Andrejs Griščenko d2cc603c133 .......... [ZBXNEXT-2557,ZBXNEXT-7826] updated proxy API tests 16 Sep 2022 2 Jira issuesMihails Prihodko 1b801827cdf M .......... [ZBXNEXT-2557] merged with the latest master 16 Sep 2022 ZBXNEXT-2557 Larisa Grigorjeva 8ccbdd9175a .......... [ZBXNEXT-2557] fixed tests 15 Sep 2022 ZBXNEXT-2557 Andrejs Griščenko c20dbc00701 .......... [ZBXNEXT-2557,ZBXNEXT-7826] updated proxy API tests 15 Sep 2022 2 Jira issuesDmitrijs Goloscapovs 8c2e1894990 M ........S. [ZBX-19783] refactored sourceip fix to get rid of global variables Merge in ZBX/zabbix from feature/ZBX-19783-6.3-1 to master
* commit 'b577392a234d1a29755e1cc617316fa5995686ea':
........S. [ZBX-19783] fixed warning
........S. [ZBX-19783] refactored sourceip fix to get rid of global variables 15 Sep 2022 ZBX-19783 Artjoms Rimdjonoks 9826742e319 M ...G...... [ZBX-21466] fixed race condition in agent2 leading to permanently stuck mount reads 15 Sep 2022 ZBX-21466 Sergejs Maklakovs e6067cfeb35 .......... [ZBXNEXT-826] updated release version [6.4.0alpha2] 15 Sep 2022 ZBXNEXT-826 Andrejs Griščenko 56dfcbf5ddd .......... [ZBXNEXT-2557,ZBXNEXT-7826] updated proxy API tests 15 Sep 2022 2 Jira issuesAndrejs Griščenko 341ced25562 .......... [ZBXNEXT-2557,ZBXNEXT-7826] update proxy API tests 15 Sep 2022 2 Jira issuesAlexander Vladishev 570bb46418d ...G...PS. [ZBX-20864] fixed format specifier definitions on AIX This reverts commit fc5d1b13e19209f174c5477a62d527827a320c6d. 15 Sep 2022 ZBX-20864 Juris Miscenko fc5d1b13e19 ...G...PS. [ZBX-20864] fixed format specifier definitions on AIX (cherry picked from commit 0d59700b87bbb35f189fa2e7a0f1c52917679242) 15 Sep 2022 ZBX-20864 Larisa Grigorjeva 44f4ed865f1 .......... [ZBXNEXT-2557] fixed tests 15 Sep 2022 ZBXNEXT-2557 Larisa Grigorjeva 106ccfe3d00 .......... [ZBXNEXT-2557] fixed ids in test data 15 Sep 2022 ZBXNEXT-2557 Larisa Grigorjeva 40729d3e9d2 M .......... [ZBXNEXT-2557] updated to latest master (no conflicts) 14 Sep 2022 ZBXNEXT-2557 Larisa Grigorjeva 10ff9a5411b .......... [ZBXNEXT-2557] fixed data in tests 14 Sep 2022 ZBXNEXT-2557 Larisa Grigorjeva c643d6a1656 .......... [ZBXNEXT-2557] fixed tests 14 Sep 2022 ZBXNEXT-2557 Larisa Grigorjeva 065f27603d3 .......... [ZBXNEXT-2557] fixed items tests 14 Sep 2022 ZBXNEXT-2557