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-06-28 10:29:16 +0300
committerSergejs Olonkins <sergejs.olonkins@zabbix.com>2021-06-28 10:29:16 +0300
commitc218b76dadba8c2d7c4ef488477b13a99faeebde (patch)
treef4fad8bd097a7acd95f10c82e0e05ce1198e8bd5
parent76b979edb877883e6d5368dc4fa2083227552c76 (diff)
.......... [ZBXNEXT-826] updated release date and version [5.0.13]5.0.13
-rw-r--r--ChangeLog10
-rw-r--r--configure.ac2
-rw-r--r--include/version.h4
-rw-r--r--src/go/pkg/version/version.go4
-rw-r--r--src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java4
-rw-r--r--ui/include/defines.inc.php2
6 files changed, 18 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 360e83ffb88..7bdd5eaae8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes for 5.0.13
+
+5.0.13rc1 was released as 5.0.13 without any changes
+
+--------------------------------------------------------------------------------
Changes for 5.0.13rc1
New features:
@@ -2121,6 +2126,11 @@ A.F.I...S. [ZBXNEXT-4853,ZBXNEXT-517] added ability to send email messages in HT
..F.....S. [ZBXNEXT-1282,ZBXNEXT-4730] added changes to introduce regex based matching for auto-registration (vasilijs, viktors)
--------------------------------------------------------------------------------
+Changes for 4.0.32
+
+4.0.32rc2 was released as 4.0.32 without any changes
+
+--------------------------------------------------------------------------------
Changes for 4.0.32rc2
Bug fixes:
diff --git a/configure.ac b/configure.ac
index b82c00004f5..afa7dcf5575 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],[5.0.13rc1])
+AC_INIT([Zabbix],[5.0.13])
AC_CONFIG_SRCDIR(src/zabbix_server/server.c)
AM_INIT_AUTOMAKE([subdir-objects filename-length-max=99])
diff --git a/include/version.h b/include/version.h
index 36c9339dfe7..62de67df3db 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 "21 June 2021"
+#define ZABBIX_REVDATE "28 June 2021"
#define ZABBIX_VERSION_MAJOR 5
#define ZABBIX_VERSION_MINOR 0
#define ZABBIX_VERSION_PATCH 13
@@ -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/go/pkg/version/version.go b/src/go/pkg/version/version.go
index 672a5591a29..82e6b530df4 100644
--- a/src/go/pkg/version/version.go
+++ b/src/go/pkg/version/version.go
@@ -29,11 +29,11 @@ import (
const (
APPLICATION_NAME = "Zabbix Agent"
- ZABBIX_REVDATE = "21 June 2021"
+ ZABBIX_REVDATE = "28 June 2021"
ZABBIX_VERSION_MAJOR = 5
ZABBIX_VERSION_MINOR = 0
ZABBIX_VERSION_PATCH = 13
- ZABBIX_VERSION_RC = "rc1"
+ ZABBIX_VERSION_RC = ""
ZABBIX_VERSION_RC_NUM = "{ZABBIX_RC_NUM}"
ZABBIX_VERSION_REVISION = "{ZABBIX_REVISION}"
copyrightMessage = "Copyright (C) 2021 Zabbix SIA\n" +
diff --git a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
index 9a847344df4..7d073fff0d5 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 = "21 June 2021";
+ static final String REVISION_DATE = "28 June 2021";
static final String REVISION = "{ZABBIX_REVISION}";
- static final String VERSION = "5.0.13rc1";
+ static final String VERSION = "5.0.13";
static void printVersion()
{
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php
index 6f91485d7f4..f2495e9a294 100644
--- a/ui/include/defines.inc.php
+++ b/ui/include/defines.inc.php
@@ -18,7 +18,7 @@
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
**/
-define('ZABBIX_VERSION', '5.0.13rc1');
+define('ZABBIX_VERSION', '5.0.13');
define('ZABBIX_API_VERSION', '5.0.13');
define('ZABBIX_EXPORT_VERSION', '5.0');
define('ZABBIX_DB_VERSION', 5000000);