diff options
author | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-04-04 10:36:06 +0300 |
---|---|---|
committer | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-04-04 10:36:06 +0300 |
commit | 506e2b51e2935f7577cf4b5a8bee55ecdc2af07d (patch) | |
tree | 1f17d01f9c7025eb69416973d80361ef530071ec | |
parent | 37683ddb9925ba2452a0d18118269b19b5b1dd18 (diff) |
.......... [ZBXNEXT-826] updated release version [6.0.3]6.0.3
-rw-r--r-- | ChangeLog | 18 | ||||
-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, 26 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 68608e8ff1f..fec9975ac20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 6.0.3 + +6.0.3rc1 was released as 6.0.3 without any changes + +-------------------------------------------------------------------------------- Changes for 6.0.3rc1 New features: @@ -33,6 +38,7 @@ A.F....... [ZBX-19118] made Host interface field non-required for HTTP agent ite ...G...... [ZBX-19407] removed the redundant encoding check in get_codepage() for Windows (arimdjonoks) ...G...... [ZBX-20390] fixed Oracle Solaris vm.memory.size[available] item kstats memory read (arimdjonoks) .........T [ZBX-20521] corrected missed typos in templates and README (drasihov) +A......... [ZBX-20698] fixed import from 2.0-4.4 to 5.0 and above with SNMP interfaces (acikuns) -------------------------------------------------------------------------------- Changes for 6.0.2 @@ -522,6 +528,11 @@ Bug fixes: .........T [ZBX-19395] changed version in links of the templates and the media (mchudinov) -------------------------------------------------------------------------------- +Changes for 5.4.12 + +5.4.12rc1 was released as 5.4.12 without any changes + +-------------------------------------------------------------------------------- Changes for 5.4.12rc1 New features: @@ -534,6 +545,7 @@ Bug fixes: ..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.4.11 @@ -1802,6 +1814,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.22 + +5.0.22rc1 was released as 5.0.22 without any changes + +-------------------------------------------------------------------------------- Changes for 5.0.22rc1 New features: @@ -1826,6 +1843,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 68be2dd9639..748e2989d5c 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.3rc1]) +AC_INIT([Zabbix],[6.0.3]) 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 05f145c3507..8c7da25629f 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 6 #define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 3 @@ -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 0ae03a29640..9aaee7d7780 100644 --- a/src/go/pkg/version/version.go +++ b/src/go/pkg/version/version.go @@ -26,11 +26,11 @@ import ( ) const ( - ZABBIX_REVDATE = "28 March 2022" + ZABBIX_REVDATE = "4 April 2022" ZABBIX_VERSION_MAJOR = 6 ZABBIX_VERSION_MINOR = 0 ZABBIX_VERSION_PATCH = 3 - 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 9bf2b2a0d66..96de861a1f6 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 = "6.0.3rc1"; + static final String VERSION = "6.0.3"; static void printVersion() { diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index 2a1689aa1e1..3d4e94cb34f 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.3rc1'); +define('ZABBIX_VERSION', '6.0.3'); define('ZABBIX_API_VERSION', '6.0.3'); define('ZABBIX_EXPORT_VERSION', '6.0'); |