diff options
author | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-04-04 10:30:27 +0300 |
---|---|---|
committer | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-04-04 10:30:27 +0300 |
commit | 90ee9e33d32dc435debac4d56f983c7cd3006e88 (patch) | |
tree | 4513b707283abc9b92546e410078dd0e52c4c39f | |
parent | 9b1c82e650707a3cc11430f67bbd40c36a013d0c (diff) |
.......... [ZBXNEXT-826] updated release version [5.0.22]5.0.22
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | include/version.h | 4 | ||||
-rw-r--r-- | src/go/pkg/version/version.go | 4 | ||||
-rw-r--r-- | src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java | 4 | ||||
-rw-r--r-- | ui/include/defines.inc.php | 2 |
6 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 4e58a1ec88c..e42848bebfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 5.0.22 + +5.0.22rc1 was released as 5.0.22 without any changes + +-------------------------------------------------------------------------------- Changes for 5.0.22rc1 New features: @@ -22,6 +27,7 @@ A......... [ZBX-20681] fixed undefined index error when accessing module page wi ..F....... [ZBX-20640] fixed X-axis field placement in different rows in Axis tab in Graph widget (acikuns) ..F....... [ZBX-20049] implemented keyboard control for info icons (acikuns, ashubin) ........S. [ZBX-19965] fixed database upgrade for SNMP interfaces (akozlovs) +A......... [ZBX-20698] fixed import from 2.0-4.4 to 5.0 and above with SNMP interfaces (acikuns) -------------------------------------------------------------------------------- Changes for 5.0.21 diff --git a/configure.ac b/configure.ac index e0bd3025db3..cc818c88a81 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl dnl Process this file with autoconf to produce a configure script. -AC_INIT([Zabbix],[5.0.22rc1]) +AC_INIT([Zabbix],[5.0.22]) AC_CONFIG_SRCDIR(src/zabbix_server/server.c) AM_INIT_AUTOMAKE([subdir-objects filename-length-max=99]) diff --git a/include/version.h b/include/version.h index 54c606d5adf..2ca19c1edd1 100644 --- a/include/version.h +++ b/include/version.h @@ -24,7 +24,7 @@ #define ZBX_STR(str) ZBX_STR2(str) #define APPLICATION_NAME "Zabbix Agent" -#define ZABBIX_REVDATE "28 March 2022" +#define ZABBIX_REVDATE "4 April 2022" #define ZABBIX_VERSION_MAJOR 5 #define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 22 @@ -36,7 +36,7 @@ # define ZABBIX_VERSION_RC_NUM {ZABBIX_RC_NUM} # endif #endif -#define ZABBIX_VERSION_RC "rc1" +#define ZABBIX_VERSION_RC "" #define ZABBIX_VERSION ZBX_STR(ZABBIX_VERSION_MAJOR) "." ZBX_STR(ZABBIX_VERSION_MINOR) "." \ ZBX_STR(ZABBIX_VERSION_PATCH) ZABBIX_VERSION_RC #define ZABBIX_REVISION ZBX_STR(ZABBIX_VERSION_REVISION) diff --git a/src/go/pkg/version/version.go b/src/go/pkg/version/version.go index 9eec310ba4b..a4cfa801c0a 100644 --- a/src/go/pkg/version/version.go +++ b/src/go/pkg/version/version.go @@ -29,11 +29,11 @@ import ( const ( APPLICATION_NAME = "Zabbix Agent" - ZABBIX_REVDATE = "28 March 2022" + ZABBIX_REVDATE = "4 April 2022" ZABBIX_VERSION_MAJOR = 5 ZABBIX_VERSION_MINOR = 0 ZABBIX_VERSION_PATCH = 22 - ZABBIX_VERSION_RC = "rc1" + ZABBIX_VERSION_RC = "" ZABBIX_VERSION_RC_NUM = "{ZABBIX_RC_NUM}" ZABBIX_VERSION_REVISION = "{ZABBIX_REVISION}" copyrightMessage = "Copyright (C) 2022 Zabbix SIA\n" + diff --git a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java index 02c5cd6a2cc..e01c914e6a4 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java +++ b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java @@ -22,9 +22,9 @@ package com.zabbix.gateway; class GeneralInformation { static final String APPLICATION_NAME = "Zabbix Java Gateway"; - static final String REVISION_DATE = "28 March 2022"; + static final String REVISION_DATE = "4 April 2022"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "5.0.22rc1"; + static final String VERSION = "5.0.22"; static void printVersion() { diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index 778bbd02d6c..af42adf735b 100644 --- a/ui/include/defines.inc.php +++ b/ui/include/defines.inc.php @@ -18,7 +18,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -define('ZABBIX_VERSION', '5.0.22rc1'); +define('ZABBIX_VERSION', '5.0.22'); define('ZABBIX_API_VERSION', '5.0.22'); define('ZABBIX_EXPORT_VERSION', '5.0'); define('ZABBIX_DB_VERSION', 5000000); |