diff options
| author | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-03-14 12:43:25 +0300 |
|---|---|---|
| committer | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-03-14 12:43:25 +0300 |
| commit | d726a4d91624f922e71140b4eaecd653e61aee66 (patch) | |
| tree | 89aba4efb20c4fd4f7898d10cdc29edc0b077faa | |
| parent | 59f17600d712ccab6aa7af7e2ffc49777a6b66da (diff) | |
.......... [ZBXNEXT-826] updated release date [6.0.2]6.0.2
| -rw-r--r-- | ChangeLog | 5 | ||||
| -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, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 52e7da78f08..5bbaf82f9e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 6.0.2 + +6.0.2rc1 was released as 6.0.2 without any changes + +-------------------------------------------------------------------------------- Changes for 6.0.2rc1 New features: diff --git a/configure.ac b/configure.ac index b6aa1238a30..9a8140d4f1b 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.0.2rc1]) +AC_INIT([Zabbix],[6.0.2]) 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 5dbcf8b5b98..8c029982203 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 "7 March 2022" +#define ZABBIX_REVDATE "14 March 2022" #define ZABBIX_VERSION_MAJOR 6 #define ZABBIX_VERSION_MINOR 0 #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 b85abb32c95..0eede8c9ba3 100644 --- a/src/go/pkg/version/version.go +++ b/src/go/pkg/version/version.go @@ -26,11 +26,11 @@ import ( ) const ( - ZABBIX_REVDATE = "7 March 2022" + ZABBIX_REVDATE = "14 March 2022" ZABBIX_VERSION_MAJOR = 6 ZABBIX_VERSION_MINOR = 0 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 e382df72c27..d603b82a507 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 = "7 March 2022"; + static final String REVISION_DATE = "14 March 2022"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "6.0.2rc1"; + static final String VERSION = "6.0.2"; static void printVersion() { diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index 5d4611f9c61..f3d2ab9da39 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.0.2rc1'); +define('ZABBIX_VERSION', '6.0.2'); define('ZABBIX_API_VERSION', '6.0.2'); define('ZABBIX_EXPORT_VERSION', '6.0'); |