diff options
| author | Sergejs Olonkins <sergejs.olonkins@zabbix.com> | 2020-09-28 10:43:00 +0300 |
|---|---|---|
| committer | Sergejs Olonkins <sergejs.olonkins@zabbix.com> | 2020-09-28 10:43:00 +0300 |
| commit | 32662425e67f65f8f85bf68222efd79dc62ddd18 (patch) | |
| tree | 77ef8b98527543957025b6a3725b0d3884b7ebb0 | |
| parent | 3c1c3a95959dee80cecbdbe2df21bd50019831a6 (diff) | |
.......... [ZBXNEXT-826] updated release date and version [4.0.25]4.0.25
| -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 67df95c1d2e..7c8c8dd9eb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 4.0.25 + +4.0.25rc1 was released as 4.0.25 without any changes + +-------------------------------------------------------------------------------- Changes for 4.0.25rc1 Bug fixes: diff --git a/configure.ac b/configure.ac index 41b46b47232..ff4b3d604b9 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.25rc1]) +AC_INIT([Zabbix],[4.0.25]) 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 6b4392880fa..65842509de5 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -19,7 +19,7 @@ **/ -define('ZABBIX_VERSION', '4.0.25rc1'); +define('ZABBIX_VERSION', '4.0.25'); define('ZABBIX_API_VERSION', '4.0.25'); define('ZABBIX_EXPORT_VERSION', '4.0'); define('ZABBIX_DB_VERSION', 4000000); diff --git a/include/version.h b/include/version.h index 0596e22ae38..c0cd18ccfb7 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 "21 September 2020" +#define ZABBIX_REVDATE "28 September 2020" #define ZABBIX_VERSION_MAJOR 4 #define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 25 @@ -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 5c528544f4f..d93ff959043 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 = "21 September 2020"; + static final String REVISION_DATE = "28 September 2020"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "4.0.25rc1"; + static final String VERSION = "4.0.25"; static void printVersion() { |