diff options
author | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2021-11-29 11:25:14 +0300 |
---|---|---|
committer | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2021-11-29 11:25:14 +0300 |
commit | c3f6aa65fefe15ec2d62fcd3364bbf04744ea248 (patch) | |
tree | 8e27e70d0fa31a58fe1ee5075e7cf7d4ad677233 | |
parent | 534949c11794b22ea7e946b230f1c252c1df7e1f (diff) |
.......... [ZBXNEXT-826] updated release date and version [5.0.18]5.0.18
-rw-r--r-- | ChangeLog | 10 | ||||
-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, 18 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 830d798b5cb..43ebd0ff7a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 5.0.18 + +5.0.18rc1 was released as 5.0.18 without any changes + +-------------------------------------------------------------------------------- Changes for 5.0.18rc1 New features: @@ -2308,6 +2313,11 @@ 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.36 + +4.0.36rc1 was released as 4.0.36 without any changes + +-------------------------------------------------------------------------------- Changes for 4.0.36rc1 Bug fixes: diff --git a/configure.ac b/configure.ac index 65b54764220..29fda9d59ff 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.18rc1]) +AC_INIT([Zabbix],[5.0.18]) 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 77982d5c5e8..97ed193689d 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 November 2021" +#define ZABBIX_REVDATE "29 November 2021" #define ZABBIX_VERSION_MAJOR 5 #define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 18 @@ -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 4bb1d130346..d84db2ad9ad 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 November 2021" + ZABBIX_REVDATE = "29 November 2021" ZABBIX_VERSION_MAJOR = 5 ZABBIX_VERSION_MINOR = 0 ZABBIX_VERSION_PATCH = 18 - ZABBIX_VERSION_RC = "rc1" + ZABBIX_VERSION_RC = "" ZABBIX_VERSION_RC_NUM = "{ZABBIX_RC_NUM}" ZABBIX_VERSION_REVISION = "{ZABBIX_REVISION}" copyrightMessage = "Copyright (C) 2021 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 32ed934e9d7..f6adc943e20 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 November 2021"; + static final String REVISION_DATE = "29 November 2021"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "5.0.18rc1"; + static final String VERSION = "5.0.18"; static void printVersion() { diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index 3a707ac7867..ee2a523168b 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.18rc1'); +define('ZABBIX_VERSION', '5.0.18'); define('ZABBIX_API_VERSION', '5.0.18'); define('ZABBIX_EXPORT_VERSION', '5.0'); define('ZABBIX_DB_VERSION', 5000000); |