diff options
author | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-02-28 11:50:03 +0300 |
---|---|---|
committer | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-02-28 11:50:03 +0300 |
commit | 47104dd574eee3ba48c332fd325f6eb78bcf5559 (patch) | |
tree | 2ff8089766a600abee7f31f5bed58b8cf0dad437 | |
parent | 497531d1eb89c4b05fc3949085f03bff443d9ba2 (diff) |
.......... [ZBXNEXT-826] updated release date and version [5.0.21]5.0.21
-rw-r--r-- | ChangeLog | 12 | ||||
-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, 20 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 07016213608..cdbd447c6b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 5.0.21 + +5.0.21rc1 was released as 5.0.21 without any changes + +-------------------------------------------------------------------------------- Changes for 5.0.21rc1 New features: @@ -25,6 +30,7 @@ Bug fixes: .........T [ZBX-20396] fixed expression for "Calculated value of innodb_log_file_size" item in MySQL templates (mchudinov) .........T [ZBX-20509] changed host group in Squid, Morningstar templates (mchudinov) ........S. [ZBX-19789] added SourceIP support to ldap simple checks (dgoloscapov) +..F....... [ZBX-20680] fixed reflected XSS issues (averza) -------------------------------------------------------------------------------- Changes for 5.0.20 @@ -2412,10 +2418,16 @@ A.F.I...S. [ZBXNEXT-4853,ZBXNEXT-517] added ability to send email messages in HT ..F.....S. [ZBXNEXT-1282,ZBXNEXT-4730] added changes to introduce regex based matching for auto-registration (vasilijs, viktors) -------------------------------------------------------------------------------- +Changes for 4.0.39 + +4.0.39rc1 was released as 4.0.39 without any changes + +-------------------------------------------------------------------------------- Changes for 4.0.39rc1 Bug fixes: ........S. [ZBX-19789] added SourceIP support to ldap simple checks (dgoloscapov) +..F....... [ZBX-20680] fixed reflected XSS issues (averza) -------------------------------------------------------------------------------- Changes for 4.0.38 diff --git a/configure.ac b/configure.ac index b33505b4f51..8ddb390b347 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.21rc1]) +AC_INIT([Zabbix],[5.0.21]) 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 1f8fcdfb20f..f974eeca6b9 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 "22 February 2022" +#define ZABBIX_REVDATE "28 February 2022" #define ZABBIX_VERSION_MAJOR 5 #define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 21 @@ -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 60797667397..5d62324d02a 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 = "22 February 2022" + ZABBIX_REVDATE = "28 February 2022" ZABBIX_VERSION_MAJOR = 5 ZABBIX_VERSION_MINOR = 0 ZABBIX_VERSION_PATCH = 21 - 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 97808a86e61..9baeefc6d77 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 = "22 February 2022"; + static final String REVISION_DATE = "28 February 2022"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "5.0.21rc1"; + static final String VERSION = "5.0.21"; static void printVersion() { diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index e683f14a0ed..e1b51289628 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.21rc1'); +define('ZABBIX_VERSION', '5.0.21'); define('ZABBIX_API_VERSION', '5.0.21'); define('ZABBIX_EXPORT_VERSION', '5.0'); define('ZABBIX_DB_VERSION', 5000000); |