diff options
| author | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-02-23 15:59:23 +0300 |
|---|---|---|
| committer | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-02-23 15:59:23 +0300 |
| commit | 65527d4b24c4d65139ce66e1ee1970536782fc7a (patch) | |
| tree | 44eb78eba6847706b4b484a5485b97733c951250 | |
| parent | 49fad9b56d42ebfc484347b8c729e222e0d29b85 (diff) | |
.......... [ZBXNEXT-826] updated release date [5.4.11rc2]
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/version.h | 2 | ||||
| -rw-r--r-- | src/go/pkg/version/version.go | 2 | ||||
| -rw-r--r-- | src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java | 2 | ||||
| -rw-r--r-- | ui/include/defines.inc.php | 2 |
6 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 42bbc038877..1c67908ffee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Changes for 5.4.11rc2 + +Bug fixes: +........S. [ZBX-20649] fixed crash when server attempted to use trigger after it was removed from cache (azeila) + +-------------------------------------------------------------------------------- Changes for 5.4.11rc1 New features: diff --git a/configure.ac b/configure.ac index 2b451d79956..4b53d9e9e38 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.11rc1]) +AC_INIT([Zabbix],[5.4.11rc2]) 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 e93a5845e3f..e97d9c65c8a 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 "rc1" +#define ZABBIX_VERSION_RC "rc2" #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 138bf9f771b..485b304cae8 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 = 11 - ZABBIX_VERSION_RC = "rc1" + ZABBIX_VERSION_RC = "rc2" 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 3215ddd4edf..3e96bf794dc 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 = "22 February 2022"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "5.4.11rc1"; + static final String VERSION = "5.4.11rc2"; static void printVersion() { diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index b6b02f40aa4..1d3f21d45e3 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.11rc1'); +define('ZABBIX_VERSION', '5.4.11rc2'); define('ZABBIX_API_VERSION', '5.4.11'); define('ZABBIX_EXPORT_VERSION', '5.4'); |