diff options
| author | Larisa Grigorjeva <larisa.grigorjeva@zabbix.com> | 2021-07-16 10:35:03 +0300 |
|---|---|---|
| committer | Larisa Grigorjeva <larisa.grigorjeva@zabbix.com> | 2021-07-16 10:35:03 +0300 |
| commit | 892ce506dbcfba609d2de77d9df5d4ed2f590011 (patch) | |
| tree | 7c05c538b0d031b6cb84ee779c1a2df998ed1dea | |
| parent | 1a88f50bd74bd2f843eba9dfc044ea35d881d82d (diff) | |
.......... [ZBXNEXT-826] updated release date and version [5.0.14]5.0.14
| -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 90185c65258..bbf1e2ab94d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 5.0.14 + +5.0.14rc1 was released as 5.0.14 without any changes + +-------------------------------------------------------------------------------- Changes for 5.0.14rc1 New features: diff --git a/configure.ac b/configure.ac index b08ef966480..02f9bdedea9 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.14rc1]) +AC_INIT([Zabbix],[5.0.14]) 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 c2f56e85494..9d000cf8e0b 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 "12 July 2021" +#define ZABBIX_REVDATE "16 July 2021" #define ZABBIX_VERSION_MAJOR 5 #define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 14 @@ -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 6504b28422a..514544c532a 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 = "12 July 2021" + ZABBIX_REVDATE = "16 July 2021" ZABBIX_VERSION_MAJOR = 5 ZABBIX_VERSION_MINOR = 0 ZABBIX_VERSION_PATCH = 14 - 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 1a9c7a44f6b..17396bf55fa 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 = "12 July 2021"; + static final String REVISION_DATE = "16 July 2021"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "5.0.14rc1"; + static final String VERSION = "5.0.14"; static void printVersion() { diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index 6c46b038a55..e7e0a88e183 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.14rc1'); +define('ZABBIX_VERSION', '5.0.14'); define('ZABBIX_API_VERSION', '5.0.14'); define('ZABBIX_EXPORT_VERSION', '5.0'); define('ZABBIX_DB_VERSION', 5000000); |