diff options
| author | Larisa Grigorjeva <larisa.grigorjeva@zabbix.com> | 2019-11-25 11:41:41 +0300 |
|---|---|---|
| committer | Larisa Grigorjeva <larisa.grigorjeva@zabbix.com> | 2019-11-25 11:41:41 +0300 |
| commit | 992445e02ca8fa824af3e8e1b4c05995277a0d46 (patch) | |
| tree | e64427823d959e5cd0a8142ca8450980d30ba102 | |
| parent | 5e164a57ce4c90ec7d99738a19b7d5b6e6047b72 (diff) | |
.......... [ZBXNEXT-826] updated release date and version [4.0.15]4.0.15
| -rw-r--r-- | ChangeLog | 5 | ||||
| -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, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 2433cac28f2..ce99054c321 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 4.0.15 + +4.0.15rc2 was released as 4.0.15 without any changes + +-------------------------------------------------------------------------------- Changes for 4.0.15rc2 Bug fixes: diff --git a/configure.ac b/configure.ac index a8240886492..0e781e807de 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.15rc2]) +AC_INIT([Zabbix],[4.0.15]) 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 43ebb22e289..3494ec75be3 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -19,7 +19,7 @@ **/ -define('ZABBIX_VERSION', '4.0.15rc2'); +define('ZABBIX_VERSION', '4.0.15'); define('ZABBIX_API_VERSION', '4.0.15'); define('ZABBIX_EXPORT_VERSION', '4.0'); define('ZABBIX_DB_VERSION', 4000000); diff --git a/include/version.h b/include/version.h index da649a9752a..8b354116045 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 November 2019" +#define ZABBIX_REVDATE "25 November 2019" #define ZABBIX_VERSION_MAJOR 4 #define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 15 @@ -32,7 +32,7 @@ #ifdef _WINDOWS # define ZABBIX_VERSION_RC_NUM {ZABBIX_RC_NUM} #endif -#define ZABBIX_VERSION_RC "rc2" +#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 87f4e990713..304ce42ab38 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 November 2019"; + static final String REVISION_DATE = "25 November 2019"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "4.0.15rc2"; + static final String VERSION = "4.0.15"; static void printVersion() { |