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>2022-11-02 11:24:28 +0300
committerSergejs Maklakovs <sergejs.maklakovs@zabbix.com>2022-11-02 11:24:28 +0300
commit6ee9217861db4319a2715322d4fa45c42a83e02d (patch)
tree78b3c97b9619b7d51cf336743b9fb921dac39a30
parenta9b9fae2075e6fdbdcffa93de359d2cdb642f75e (diff)
.......... [ZBXNEXT-826] updated release date and version [6.2.4]
-rw-r--r--ChangeLog15
-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, 23 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index cd9eec44dd0..aa69e1368cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes for 6.2.4
+
+6.2.4rc1 was released as 6.2.4 without any changes
+
+--------------------------------------------------------------------------------
Changes for 6.2.4rc1
New features:
@@ -429,6 +434,11 @@ A.F....PS. [ZBXNEXT-7402,ZBXNEXT-7413] added support for CyberArk Vault (acikuns
..F....... [ZBXNEXT-7138] added modal form for API tokens in User settings->API tokens and Administration->General->API tokens (epulke)
--------------------------------------------------------------------------------
+Changes for 6.0.10
+
+6.0.10rc2 was released as 6.0.10 without any changes
+
+--------------------------------------------------------------------------------
Changes for 6.0.10rc2
6.0.10rc2 was released as 6.0.10rc1 including missing templates
@@ -2614,6 +2624,11 @@ A......... [ZBX-17955] fixed "medias" parameter named inconsistency in user.crea
.......PS. [ZBX-17548] don't store text items with history 0 in proxy history (wiper)
--------------------------------------------------------------------------------
+Changes for 5.0.29
+
+5.0.29rc2 was released as 5.0.29 without any changes
+
+--------------------------------------------------------------------------------
Changes for 5.0.29rc2
5.0.29rc2 was released as 5.0.29rc1 including missing templates
diff --git a/configure.ac b/configure.ac
index 79f948c06cc..4906c2f001c 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],[6.2.4rc1])
+AC_INIT([Zabbix],[6.2.4])
AC_CONFIG_SRCDIR(src/zabbix_server/server.c)
AM_INIT_AUTOMAKE([subdir-objects tar-pax])
diff --git a/include/version.h b/include/version.h
index c6ef95a66c7..0e75ee63408 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 "26 October 2022"
+#define ZABBIX_REVDATE "2 November 2022"
#define ZABBIX_VERSION_MAJOR 6
#define ZABBIX_VERSION_MINOR 2
#define ZABBIX_VERSION_PATCH 4
@@ -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 812676deb1e..89012ecd7f2 100644
--- a/src/go/pkg/version/version.go
+++ b/src/go/pkg/version/version.go
@@ -26,11 +26,11 @@ import (
)
const (
- ZABBIX_REVDATE = "26 October 2022"
+ ZABBIX_REVDATE = "2 November 2022"
ZABBIX_VERSION_MAJOR = 6
ZABBIX_VERSION_MINOR = 2
ZABBIX_VERSION_PATCH = 4
- ZABBIX_VERSION_RC = "rc1"
+ ZABBIX_VERSION_RC = ""
ZABBIX_VERSION_RC_NUM = "{ZABBIX_RC_NUM}"
ZABBIX_VERSION_REVISION = "{ZABBIX_REVISION}"
copyrightMessage = "Copyright (C) 2022 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 dde93ca0ef4..3232a772c9e 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 = "26 October 2022";
+ static final String REVISION_DATE = "2 November 2022";
static final String REVISION = "{ZABBIX_REVISION}";
- static final String VERSION = "6.2.4rc1";
+ static final String VERSION = "6.2.4";
static void printVersion()
{
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php
index b6cfafc0db5..893008f7fa5 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', '6.2.4rc1');
+define('ZABBIX_VERSION', '6.2.4');
define('ZABBIX_API_VERSION', '6.2.4');
define('ZABBIX_EXPORT_VERSION', '6.2');