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>2020-07-13 10:36:33 +0300
committerSergejs Olonkins <sergejs.olonkins@zabbix.com>2020-07-13 10:36:33 +0300
commit352ca0587092827105859693217c156024e5eab2 (patch)
treee48e785cb517259cb7eb90f74e427d140d2b5ecd
parentd55fa34543b9c6d5fd0612841903480f7bb1f544 (diff)
.......... [ZBXNEXT-826] updated release date and version [5.0.2]5.0.2
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
-rw-r--r--include/version.h4
-rw-r--r--src/go/pkg/version/version.go2
-rw-r--r--src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java4
-rw-r--r--ui/include/defines.inc.php2
6 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d96753bb320..e10b2c2f463 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes for 5.0.2
+
+5.0.2rc1 was released as 5.0.2 without any changes
+
+--------------------------------------------------------------------------------
Changes for 5.0.2rc1
New features:
diff --git a/configure.ac b/configure.ac
index cf3d521164c..5e8a08bbc2b 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.2rc1])
+AC_INIT([Zabbix],[5.0.2])
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 0087e66a3e7..cd88358cf10 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 "6 July 2020"
+#define ZABBIX_REVDATE "13 July 2020"
#define ZABBIX_VERSION_MAJOR 5
#define ZABBIX_VERSION_MINOR 0
#define ZABBIX_VERSION_PATCH 2
@@ -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 72421716fc9..a91963d1286 100644
--- a/src/go/pkg/version/version.go
+++ b/src/go/pkg/version/version.go
@@ -33,7 +33,7 @@ const (
ZABBIX_VERSION_MAJOR = 5
ZABBIX_VERSION_MINOR = 0
ZABBIX_VERSION_PATCH = 2
- ZABBIX_VERSION_RC = "rc1"
+ ZABBIX_VERSION_RC = ""
ZABBIX_VERSION_RC_NUM = "{ZABBIX_RC_NUM}"
ZABBIX_VERSION_REVISION = "{ZABBIX_REVISION}"
copyrightMessage = "Copyright (C) 2020 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 5f413707585..d8825126061 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 = "6 July 2020";
+ static final String REVISION_DATE = "13 July 2020";
static final String REVISION = "{ZABBIX_REVISION}";
- static final String VERSION = "5.0.2rc1";
+ static final String VERSION = "5.0.2";
static void printVersion()
{
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php
index c1e1cdd78ce..63e51071bb3 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.2rc1');
+define('ZABBIX_VERSION', '5.0.2');
define('ZABBIX_API_VERSION', '5.0.2');
define('ZABBIX_EXPORT_VERSION', '5.0');
define('ZABBIX_DB_VERSION', 5000000);