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>2021-05-24 10:43:30 +0300
committerSergejs Olonkins <sergejs.olonkins@zabbix.com>2021-05-24 10:43:30 +0300
commit701fac68dadd64f71fa9cdc48d60e6674b741051 (patch)
treec51117446f2e4a1f8e1ade26b92ccae0498d34a9
parent5e4692bb4028234363ecf6cef1daaf39f5046a60 (diff)
.......... [ZBXNEXT-826] updated release date and version [4.0.31]4.0.31
-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 7161e2ee303..b0b814ffc76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes for 4.0.31
+
+4.0.31rc1 was released as 4.0.31 without any changes
+
+--------------------------------------------------------------------------------
Changes for 4.0.31rc1
Bug fixes:
diff --git a/configure.ac b/configure.ac
index d970865e8cb..34410c50bb7 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.31rc1])
+AC_INIT([Zabbix],[4.0.31])
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 43fff536f62..34b8d12402c 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -19,7 +19,7 @@
**/
-define('ZABBIX_VERSION', '4.0.31rc1');
+define('ZABBIX_VERSION', '4.0.31');
define('ZABBIX_API_VERSION', '4.0.31');
define('ZABBIX_EXPORT_VERSION', '4.0');
define('ZABBIX_DB_VERSION', 4000000);
diff --git a/include/version.h b/include/version.h
index 364e643987f..1eb3112d8fc 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 May 2021"
+#define ZABBIX_REVDATE "24 May 2021"
#define ZABBIX_VERSION_MAJOR 4
#define ZABBIX_VERSION_MINOR 0
#define ZABBIX_VERSION_PATCH 31
@@ -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 7f7b7b1ec6e..b8136d1500a 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 May 2021";
+ static final String REVISION_DATE = "24 May 2021";
static final String REVISION = "{ZABBIX_REVISION}";
- static final String VERSION = "4.0.31rc1";
+ static final String VERSION = "4.0.31";
static void printVersion()
{