Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergejs Olonkins <sergejs.olonkins@zabbix.com>2020-08-24 10:32:01 +0300
committerSergejs Olonkins <sergejs.olonkins@zabbix.com>2020-08-24 10:32:01 +0300
commit95be642769f358556dc3918ae944983920b4a0a8 (patch)
treec7826bd8363c4b399e6a256152c82abf66340d3c
parentdbdc4a3881384f7422c3d90f06fce524b8f5d381 (diff)
.......... [ZBXNEXT-826] updated release date and version [4.0.24]4.0.24
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
-rw-r--r--frontends/php/include/defines.inc.php2
-rw-r--r--include/version.h4
-rw-r--r--src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java4
5 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b48b062fa4c..df5d090edf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes for 4.0.24
+
+4.0.24rc2 was released as 4.0.24 without any changes
+
+--------------------------------------------------------------------------------
Changes for 4.0.24rc2
Bug fixes:
diff --git a/configure.ac b/configure.ac
index 56f6aa4d38c..b0f7689c6fe 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.24rc2])
+AC_INIT([Zabbix],[4.0.24])
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 6c398d11e3e..f97ebb9e31c 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -19,7 +19,7 @@
**/
-define('ZABBIX_VERSION', '4.0.24rc2');
+define('ZABBIX_VERSION', '4.0.24');
define('ZABBIX_API_VERSION', '4.0.24');
define('ZABBIX_EXPORT_VERSION', '4.0');
define('ZABBIX_DB_VERSION', 4000000);
diff --git a/include/version.h b/include/version.h
index dd6e98002ff..46e348695ad 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 August 2020"
+#define ZABBIX_REVDATE "24 August 2020"
#define ZABBIX_VERSION_MAJOR 4
#define ZABBIX_VERSION_MINOR 0
#define ZABBIX_VERSION_PATCH 24
@@ -36,7 +36,7 @@
# define ZABBIX_VERSION_RC_NUM {ZABBIX_RC_NUM}
# endif
#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 c95338b4a1f..766b4912c5c 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 August 2020";
+ static final String REVISION_DATE = "24 August 2020";
static final String REVISION = "{ZABBIX_REVISION}";
- static final String VERSION = "4.0.24rc2";
+ static final String VERSION = "4.0.24";
static void printVersion()
{