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:
authorLarisa Grigorjeva <larisa.grigorjeva@zabbix.com>2019-07-29 10:42:24 +0300
committerLarisa Grigorjeva <larisa.grigorjeva@zabbix.com>2019-07-29 10:42:24 +0300
commit53bb6bc0f07fd605e639395d861c7db3df2e9b06 (patch)
treeda656a765f38803ea5322d7916487dc0588d773d
parent05075e191cfd6d35c4f2582edd62e1a63083d57c (diff)
.......... [ZBXNEXT-826] updated release date and version [4.0.11]4.0.11
-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 32912da0d0e..c125a01e996 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes for 4.0.11
+
+4.0.11rc1 was released as 4.0.11 without any changes
+
+--------------------------------------------------------------------------------
Changes for 4.0.11rc1
New features:
diff --git a/configure.ac b/configure.ac
index e4b3c883586..af4580a2a3b 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.11rc1])
+AC_INIT([Zabbix],[4.0.11])
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 5f29af56d76..05812db3e89 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -19,7 +19,7 @@
**/
-define('ZABBIX_VERSION', '4.0.11rc1');
+define('ZABBIX_VERSION', '4.0.11');
define('ZABBIX_API_VERSION', '4.0.11');
define('ZABBIX_EXPORT_VERSION', '4.0');
define('ZABBIX_DB_VERSION', 4000000);
diff --git a/include/version.h b/include/version.h
index e8bc51f10a0..0a0b45462bd 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 July 2019"
+#define ZABBIX_REVDATE "29 July 2019"
#define ZABBIX_VERSION_MAJOR 4
#define ZABBIX_VERSION_MINOR 0
#define ZABBIX_VERSION_PATCH 11
@@ -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 8174070be81..d93267217b8 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 July 2019";
+ static final String REVISION_DATE = "29 July 2019";
static final String REVISION = "{ZABBIX_REVISION}";
- static final String VERSION = "4.0.11rc1";
+ static final String VERSION = "4.0.11";
static void printVersion()
{