diff options
author | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-08-29 09:20:21 +0300 |
---|---|---|
committer | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-08-29 09:20:21 +0300 |
commit | 354558660736c2fb4c40c8f81ba0b5c97f408342 (patch) | |
tree | 201f91548f6f0e6224349bee7f40e8f11c4e0d18 | |
parent | 799362488966b4078a1db8affd5c9e1749857d84 (diff) |
.......... [ZBXNEXT-826] updated release date and version [6.2.2]6.2.2
-rw-r--r-- | ChangeLog | 15 | ||||
-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, 23 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index d5516d01bef..c236881939f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 6.2.2 + +6.2.2rc1 was released as 6.2.2 without any changes + +-------------------------------------------------------------------------------- Changes for 6.2.2rc1 New features: @@ -316,6 +321,11 @@ A.F....PS. [ZBXNEXT-7402,ZBXNEXT-7413] added support for CyberArk Vault (acikuns ..F....... [ZBXNEXT-7138] added modal form for API tokens in User settings->API tokens and Administration->General->API tokens (epulke) -------------------------------------------------------------------------------- +Changes for 6.0.8 + +6.0.8rc2 was released as 6.0.8 without any changes + +-------------------------------------------------------------------------------- Changes for 6.0.8rc2 Bug fixes: @@ -2394,6 +2404,11 @@ A......... [ZBX-17955] fixed "medias" parameter named inconsistency in user.crea .......PS. [ZBX-17548] don't store text items with history 0 in proxy history (wiper) -------------------------------------------------------------------------------- +Changes for 5.0.27 + +5.0.27rc1 was released as 5.0.27 without any changes + +-------------------------------------------------------------------------------- Changes for 5.0.27rc1 New features: diff --git a/configure.ac b/configure.ac index 66c51a81370..502db2fe440 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],[6.2.2rc1]) +AC_INIT([Zabbix],[6.2.2]) AC_CONFIG_SRCDIR(src/zabbix_server/server.c) AM_INIT_AUTOMAKE([subdir-objects tar-pax]) diff --git a/include/version.h b/include/version.h index a5025e8820d..c5b7b0e3e22 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 August 2022" +#define ZABBIX_REVDATE "29 August 2022" #define ZABBIX_VERSION_MAJOR 6 #define ZABBIX_VERSION_MINOR 2 #define ZABBIX_VERSION_PATCH 2 @@ -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 ba3bbc1a455..713725c62e4 100644 --- a/src/go/pkg/version/version.go +++ b/src/go/pkg/version/version.go @@ -26,11 +26,11 @@ import ( ) const ( - ZABBIX_REVDATE = "22 August 2022" + ZABBIX_REVDATE = "29 August 2022" ZABBIX_VERSION_MAJOR = 6 ZABBIX_VERSION_MINOR = 2 ZABBIX_VERSION_PATCH = 2 - 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 a1254f4c4d7..11980f9ae0b 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 August 2022"; + static final String REVISION_DATE = "29 August 2022"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "6.2.2rc1"; + static final String VERSION = "6.2.2"; static void printVersion() { diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index 4e0d8827bd6..2bbc309b878 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', '6.2.2rc1'); +define('ZABBIX_VERSION', '6.2.2'); define('ZABBIX_API_VERSION', '6.2.2'); define('ZABBIX_EXPORT_VERSION', '6.2'); |