diff options
| author | Sergejs Olonkins <sergejs.olonkins@zabbix.com> | 2020-04-27 12:20:57 +0300 |
|---|---|---|
| committer | Sergejs Olonkins <sergejs.olonkins@zabbix.com> | 2020-04-27 12:20:57 +0300 |
| commit | 3b651d1b0bd0fc5b46467dbfd84648fa1d04f574 (patch) | |
| tree | 79ef8fcc517b8ff0a3c649d7375cf6184e89a3ce | |
| parent | 8b2971fcff3b783c9ef2d2997f7599217b801323 (diff) | |
.......... [ZBXNEXT-826] updated release date and version [4.0.20]4.0.20
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | frontends/php/include/defines.inc.php | 2 | ||||
| -rw-r--r-- | include/version.h | 4 | ||||
| -rw-r--r-- | src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java | 4 |
5 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 93b2eda0ea8..19e0b04ebcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 4.0.20 + +4.0.20rc1 was released as 4.0.20 without any changes + +-------------------------------------------------------------------------------- Changes for 4.0.20rc1 New features: @@ -2842,6 +2847,11 @@ A......... [ZBX-10049] fixed optional field validation in drule.update API metho ..F....... [ZBX-9989] optimized SQL queries for graphs building (Gunars, Sasha) -------------------------------------------------------------------------------- +Changes for 3.0.31 + +3.0.31rc1 was released as 3.0.31 without any changes + +-------------------------------------------------------------------------------- Changes for 3.0.31rc1 Bug fixes: diff --git a/configure.ac b/configure.ac index 74e8bc5eff2..ce5846b1c7b 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],[4.0.20rc1]) +AC_INIT([Zabbix],[4.0.20]) AC_CONFIG_SRCDIR(src/zabbix_server/server.c) AM_INIT_AUTOMAKE([subdir-objects filename-length-max=99]) diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index d13e0f4a6c9..2af22f3778e 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -19,7 +19,7 @@ **/ -define('ZABBIX_VERSION', '4.0.20rc1'); +define('ZABBIX_VERSION', '4.0.20'); define('ZABBIX_API_VERSION', '4.0.20'); define('ZABBIX_EXPORT_VERSION', '4.0'); define('ZABBIX_DB_VERSION', 4000000); diff --git a/include/version.h b/include/version.h index 90e100676f3..1c9af1accbb 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 "20 April 2020" +#define ZABBIX_REVDATE "27 April 2020" #define ZABBIX_VERSION_MAJOR 4 #define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 20 @@ -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/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java index 9b5b932182e..7ca12584d14 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 = "20 April 2020"; + static final String REVISION_DATE = "27 April 2020"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "4.0.20rc1"; + static final String VERSION = "4.0.20"; static void printVersion() { |