diff options
author | Sergejs Olonkins <sergejs.olonkins@zabbix.com> | 2022-01-11 15:23:42 +0300 |
---|---|---|
committer | Sergejs Olonkins <sergejs.olonkins@zabbix.com> | 2022-01-11 15:23:42 +0300 |
commit | 168d08c6f625a6861a540cba0170a0255da50920 (patch) | |
tree | 7a209743ca360c46171022c815b105183c8e0016 | |
parent | 19a05293cf1c2d327a999ea5c1222d5c620bf00a (diff) |
.......... [ZBXNEXT-826] updated release version [6.0.0rc1]
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | include/version.h | 2 | ||||
-rw-r--r-- | src/go/pkg/version/version.go | 2 | ||||
-rw-r--r-- | src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java | 2 | ||||
-rw-r--r-- | ui/include/defines.inc.php | 2 |
6 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 08917dbac88..bc4aff9608d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Changes for 6.0.0rc1 + +New features: + +Bug fixes: + +-------------------------------------------------------------------------------- Changes for 6.0.0beta2 New features: @@ -15,6 +22,10 @@ A......... [ZBXNEXT-6470,ZBXNEXT-6890] implemented complete audit logging of mai ...G...PS. [ZBXNEXT-4922] added support for pcre2 (yurii) Bug fixes: +..F....... [ZBX-20382] updated jquery version (ashubin) +.....J.... [ZBX-20383] updated logback-core, logback-classic and slf4j-api jars to the latest stable versions (vso) +..F.I..... [ZBX-20384] fixed possibility to view setup pages by non-superadmin if config already file exists (averza) +..F....... [ZBX-20388] fixed XSS vulnerability in multiselect (agriscenko) A......... [ZBX-19815] fixed multiple data convertion issues in import between versions 1.8/2.0 and 5.0 (Ivo) .......PS. [ZBX-20405] improved timeouts in JS (dgoloscapov, wiper) ..F....... [ZBX-19669] fixed success message not showing when no fields were changed in Administration->Authentication page (Ivo) diff --git a/configure.ac b/configure.ac index 1eec2aeb788..69862ef593b 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.0beta2]) +AC_INIT([Zabbix],[6.0.0rc1]) 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 9c33bd87ac9..93ed0e31ce8 100644 --- a/include/version.h +++ b/include/version.h @@ -36,7 +36,7 @@ # define ZABBIX_VERSION_RC_NUM {ZABBIX_RC_NUM} # endif #endif -#define ZABBIX_VERSION_RC "beta2" +#define ZABBIX_VERSION_RC "rc1" #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 f698493a9aa..c1c01da816a 100644 --- a/src/go/pkg/version/version.go +++ b/src/go/pkg/version/version.go @@ -30,7 +30,7 @@ const ( ZABBIX_VERSION_MAJOR = 6 ZABBIX_VERSION_MINOR = 0 ZABBIX_VERSION_PATCH = 0 - ZABBIX_VERSION_RC = "beta2" + ZABBIX_VERSION_RC = "rc1" 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 9c4159ac476..5c25a625fa1 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java +++ b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java @@ -24,7 +24,7 @@ class GeneralInformation static final String APPLICATION_NAME = "Zabbix Java Gateway"; static final String REVISION_DATE = "11 January 2022"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "6.0.0beta2"; + static final String VERSION = "6.0.0rc1"; static void printVersion() { diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index b7f0d7636c5..8f08815fbbb 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.0beta2'); +define('ZABBIX_VERSION', '6.0.0rc1'); define('ZABBIX_API_VERSION', '6.0.0'); define('ZABBIX_EXPORT_VERSION', '6.0'); |