diff options
| author | Natalja Karpinska <natalja.karpinska@zabbix.com> | 2019-06-26 13:32:12 +0300 |
|---|---|---|
| committer | Natalja Karpinska <natalja.karpinska@zabbix.com> | 2019-06-26 13:32:12 +0300 |
| commit | cc25224816fff56e8305b06f06f0ec13c4759782 (patch) | |
| tree | d94ccfeddd6b5085ba17029d281770483695d1a9 | |
| parent | f07bac1efa96cf364d9c77bec4f965bf4c6c465c (diff) | |
.......... [ZBXNEXT-826] updated release date and version [4.0.10]4.0.10
| -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 12cbaccddbe..8418aaff581 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 4.0.10 + +4.0.10rc1 was released as 4.0.10 without any changes + +-------------------------------------------------------------------------------- Changes for 4.0.10rc1 New features: diff --git a/configure.ac b/configure.ac index 394bac11e3c..d77b2fec1e0 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.10rc1]) +AC_INIT([Zabbix],[4.0.10]) AC_CONFIG_SRCDIR(src/zabbix_server/server.c) AM_INIT_AUTOMAKE([subdir-objects]) diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index 62355177b1b..275ee0b7631 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -19,7 +19,7 @@ **/ -define('ZABBIX_VERSION', '4.0.10rc1'); +define('ZABBIX_VERSION', '4.0.10'); define('ZABBIX_API_VERSION', '4.0.10'); define('ZABBIX_EXPORT_VERSION', '4.0'); define('ZABBIX_DB_VERSION', 4000000); diff --git a/include/version.h b/include/version.h index a88eb960f0a..0aa0438d98f 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 "17 June 2019" +#define ZABBIX_REVDATE "26 June 2019" #define ZABBIX_VERSION_MAJOR 4 #define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 10 @@ -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 2c943b84ab3..0b5d6c24dbc 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 = "17 June 2019"; + static final String REVISION_DATE = "26 June 2019"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "4.0.10rc1"; + static final String VERSION = "4.0.10"; static void printVersion() { |