diff options
| author | Sergejs Olonkins <sergejs.olonkins@zabbix.com> | 2020-01-28 17:09:49 +0300 |
|---|---|---|
| committer | Sergejs Olonkins <sergejs.olonkins@zabbix.com> | 2020-01-28 17:09:49 +0300 |
| commit | a528a0a4bcaed5229ccd6225a34c368e58b2af07 (patch) | |
| tree | febc719dfa56748b94fcd249603221775cda5537 | |
| parent | 0a3bd8f59f4ff5b446f96c420a38d2bf74d665b2 (diff) | |
.......... [ZBXNEXT-826] updated release date and version [4.0.17]4.0.17
| -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 c4f0cb096c3..f5ebedfc6f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 4.0.17 + +4.0.17rc1 was released as 4.0.17 without any changes + +-------------------------------------------------------------------------------- Changes for 4.0.17rc1 New features: diff --git a/configure.ac b/configure.ac index 1c0f96071b6..33d1b658bca 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.17rc1]) +AC_INIT([Zabbix],[4.0.17]) 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 530aade2863..f80658b2eea 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -19,7 +19,7 @@ **/ -define('ZABBIX_VERSION', '4.0.17rc1'); +define('ZABBIX_VERSION', '4.0.17'); define('ZABBIX_API_VERSION', '4.0.17'); define('ZABBIX_EXPORT_VERSION', '4.0'); define('ZABBIX_DB_VERSION', 4000000); diff --git a/include/version.h b/include/version.h index c81cb9e36f9..0042a6bc4d0 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 January 2020" +#define ZABBIX_REVDATE "28 January 2020" #define ZABBIX_VERSION_MAJOR 4 #define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 17 @@ -32,7 +32,7 @@ #ifdef _WINDOWS # define ZABBIX_VERSION_RC_NUM {ZABBIX_RC_NUM} #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 385187d95f0..7a954a66ed5 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 January 2020"; + static final String REVISION_DATE = "28 January 2020"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "4.0.17rc1"; + static final String VERSION = "4.0.17"; static void printVersion() { |