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:
-rw-r--r--ChangeLog14
-rw-r--r--configure.ac2
-rw-r--r--include/version.h2
-rw-r--r--src/go/pkg/version/version.go2
-rw-r--r--src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java2
-rw-r--r--ui/include/defines.inc.php2
6 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fdb8f3bc5f..c7038d4b7ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Changes for 5.4.0rc1
+
+New features:
+
+Bug fixes:
+
+--------------------------------------------------------------------------------
Changes for 5.4.0beta3
New features:
@@ -687,6 +694,13 @@ 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.12rc1
+
+New features:
+
+Bug fixes:
+
+--------------------------------------------------------------------------------
Changes for 5.0.11
5.0.11rc1 was released as 5.0.11 without any changes
diff --git a/configure.ac b/configure.ac
index fc23c6c3564..6b3bf2fb357 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.4.0beta3])
+AC_INIT([Zabbix],[5.4.0rc1])
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 0ff06f54fa9..fef5d4ade55 100644
--- a/include/version.h
+++ b/include/version.h
@@ -36,7 +36,7 @@
# define ZABBIX_VERSION_RC_NUM {ZABBIX_RC_NUM}
# endif
#endif
-#define ZABBIX_VERSION_RC "beta3"
+#define ZABBIX_VERSION_RC "rc1"
#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 673e9f00abc..e2e6ee9215d 100644
--- a/src/go/pkg/version/version.go
+++ b/src/go/pkg/version/version.go
@@ -30,7 +30,7 @@ const (
ZABBIX_VERSION_MAJOR = 5
ZABBIX_VERSION_MINOR = 4
ZABBIX_VERSION_PATCH = 0
- ZABBIX_VERSION_RC = "beta3"
+ ZABBIX_VERSION_RC = "rc1"
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 413bc68bb77..2747f6dcb39 100644
--- a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
+++ b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
@@ -24,7 +24,7 @@ class GeneralInformation
static final String APPLICATION_NAME = "Zabbix Java Gateway";
static final String REVISION_DATE = "26 April 2021";
static final String REVISION = "{ZABBIX_REVISION}";
- static final String VERSION = "5.4.0beta3";
+ static final String VERSION = "5.4.0rc1";
static void printVersion()
{
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php
index dbbcaabf9e0..f677545b29c 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.4.0beta3');
+define('ZABBIX_VERSION', '5.4.0rc1');
define('ZABBIX_API_VERSION', '5.4.0');
define('ZABBIX_EXPORT_VERSION', '5.4');
define('ZABBIX_DB_VERSION', 5030163);