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 Maklakovs <sergejs.maklakovs@zabbix.com>2021-12-23 11:14:23 +0300
committerSergejs Maklakovs <sergejs.maklakovs@zabbix.com>2021-12-23 11:14:23 +0300
commita039afba501791b8bc320dde2e096d13de20b120 (patch)
tree9e62f746e24b986103775960c535b3aa1e27931c
parent7d9d3d0734ef362fd7b05a5bc027ee329a6b3db9 (diff)
.......... [ZBXNEXT-826] updated release date and version [4.0.37]4.0.37
-rw-r--r--ChangeLog7
-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, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 828fb3f80e8..02828165a0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+Changes for 4.0.37
+
+4.0.37rc1 was released as 4.0.37 without any changes
+
+--------------------------------------------------------------------------------
Changes for 4.0.37rc1
Bug fixes:
..F....... [ZBX-20382] updated jquery version (ashubin)
+.....J.... [ZBX-20383] updated logback-core, logback-classic and slf4j-api jars to the latest stable versions (vso)
+..F.I..... [ZBX-20384] fixed possibility to view setup pages by non-superadmin if config already file exists (averza)
--------------------------------------------------------------------------------
Changes for 4.0.36
diff --git a/configure.ac b/configure.ac
index 631aabd8ffc..37e6b5df28a 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.37rc1])
+AC_INIT([Zabbix],[4.0.37])
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 f914c642c9f..0a808dd445f 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -19,7 +19,7 @@
**/
-define('ZABBIX_VERSION', '4.0.37rc1');
+define('ZABBIX_VERSION', '4.0.37');
define('ZABBIX_API_VERSION', '4.0.37');
define('ZABBIX_EXPORT_VERSION', '4.0');
define('ZABBIX_DB_VERSION', 4000000);
diff --git a/include/version.h b/include/version.h
index 80639269c03..e56622da9c8 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 "22 December 2021"
+#define ZABBIX_REVDATE "23 December 2021"
#define ZABBIX_VERSION_MAJOR 4
#define ZABBIX_VERSION_MINOR 0
#define ZABBIX_VERSION_PATCH 37
@@ -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 c1e96e49267..07af6667419 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 = "22 December 2021";
+ static final String REVISION_DATE = "23 December 2021";
static final String REVISION = "{ZABBIX_REVISION}";
- static final String VERSION = "4.0.37rc1";
+ static final String VERSION = "4.0.37";
static void printVersion()
{