diff options
author | Sergejs Olonkins <sergejs.olonkins@zabbix.com> | 2020-10-26 11:34:18 +0300 |
---|---|---|
committer | Sergejs Olonkins <sergejs.olonkins@zabbix.com> | 2020-10-26 11:34:18 +0300 |
commit | eb5a408168016d16b9179662cced34ef6f3dc5cd (patch) | |
tree | 8a9284992b8c1f60123fe42fb17e41fc05f8c799 | |
parent | a56b3af825ef442edf3bdaf41022003a74851466 (diff) |
.......... [ZBXNEXT-826] updated release date and version [4.0.26]4.0.26
-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 696955ef720..81dd8c019ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 4.0.26 + +4.0.26rc1 was released as 4.0.26 without any changes + +-------------------------------------------------------------------------------- Changes for 4.0.26rc1 Bug fixes: diff --git a/configure.ac b/configure.ac index 1fd543c385b..b33313c90d7 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.26rc1]) +AC_INIT([Zabbix],[4.0.26]) 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 75ec6f7f12a..db19539b816 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -19,7 +19,7 @@ **/ -define('ZABBIX_VERSION', '4.0.26rc1'); +define('ZABBIX_VERSION', '4.0.26'); define('ZABBIX_API_VERSION', '4.0.26'); define('ZABBIX_EXPORT_VERSION', '4.0'); define('ZABBIX_DB_VERSION', 4000000); diff --git a/include/version.h b/include/version.h index f1c6b19af4a..9503c02f2b0 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 "19 October 2020" +#define ZABBIX_REVDATE "26 October 2020" #define ZABBIX_VERSION_MAJOR 4 #define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 26 @@ -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 5cdf31ac096..8359ef56362 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 = "19 October 2020"; + static final String REVISION_DATE = "26 October 2020"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "4.0.26rc1"; + static final String VERSION = "4.0.26"; static void printVersion() { |