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>2019-12-19 19:21:39 +0300
committerSergejs Olonkins <sergejs.olonkins@zabbix.com>2019-12-19 19:21:39 +0300
commit9377bec6660ddea4661543795197d0d5556b28f7 (patch)
treeae8b67e374a32cefb9a88d7ac8d9f9bac7392249
parent2cc51bcff0e15bde9f5890b1654e66d8abed420c (diff)
.......... [ZBXNEXT-826] updated release date and version [4.0.16]4.0.16
-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 d9082c940cc..93982e48074 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes for 4.0.16
+
+4.0.16rc1 was released as 4.0.16 without any changes
+
+--------------------------------------------------------------------------------
Changes for 4.0.16rc1
New features:
diff --git a/configure.ac b/configure.ac
index c754caae171..aff752dcec6 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.16rc1])
+AC_INIT([Zabbix],[4.0.16])
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 7afa64f5d9f..632192ec63d 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -19,7 +19,7 @@
**/
-define('ZABBIX_VERSION', '4.0.16rc1');
+define('ZABBIX_VERSION', '4.0.16');
define('ZABBIX_API_VERSION', '4.0.16');
define('ZABBIX_EXPORT_VERSION', '4.0');
define('ZABBIX_DB_VERSION', 4000000);
diff --git a/include/version.h b/include/version.h
index 26e2d6951ad..516839945d3 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 "16 December 2019"
+#define ZABBIX_REVDATE "19 December 2019"
#define ZABBIX_VERSION_MAJOR 4
#define ZABBIX_VERSION_MINOR 0
#define ZABBIX_VERSION_PATCH 16
@@ -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 8234022461e..fee60e17336 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 = "16 December 2019";
+ static final String REVISION_DATE = "19 December 2019";
static final String REVISION = "{ZABBIX_REVISION}";
- static final String VERSION = "4.0.16rc1";
+ static final String VERSION = "4.0.16";
static void printVersion()
{