diff options
author | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-03-14 16:49:16 +0300 |
---|---|---|
committer | Sergejs Maklakovs <sergejs.maklakovs@zabbix.com> | 2022-03-14 16:49:16 +0300 |
commit | f362050405bdded97c2fb9c1d738dab112435af5 (patch) | |
tree | ea3568a110c3162c7d8c077e2b8a0dd9cb7fe374 | |
parent | d726a4d91624f922e71140b4eaecd653e61aee66 (diff) |
.......... [ZBXNEXT-826] updated release version [6.0.3rc1]; updated API version [6.0.3]
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | include/version.h | 4 | ||||
-rw-r--r-- | src/go/pkg/version/version.go | 4 | ||||
-rw-r--r-- | src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java | 2 | ||||
-rw-r--r-- | ui/include/defines.inc.php | 4 | ||||
-rw-r--r-- | ui/tests/api_json/testAPIInfo.php | 2 |
7 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 5bbaf82f9e6..0d8d6d2daff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Changes for 6.0.3rc1 + +New features: + +Bug fixes: + +-------------------------------------------------------------------------------- Changes for 6.0.2 6.0.2rc1 was released as 6.0.2 without any changes diff --git a/configure.ac b/configure.ac index 9a8140d4f1b..68be2dd9639 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.0.2]) +AC_INIT([Zabbix],[6.0.3rc1]) 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 8c029982203..a1b03f98399 100644 --- a/include/version.h +++ b/include/version.h @@ -27,7 +27,7 @@ #define ZABBIX_REVDATE "14 March 2022" #define ZABBIX_VERSION_MAJOR 6 #define ZABBIX_VERSION_MINOR 0 -#define ZABBIX_VERSION_PATCH 2 +#define ZABBIX_VERSION_PATCH 3 #ifndef ZABBIX_VERSION_REVISION # define ZABBIX_VERSION_REVISION {ZABBIX_REVISION} #endif @@ -36,7 +36,7 @@ # define ZABBIX_VERSION_RC_NUM {ZABBIX_RC_NUM} # endif #endif -#define ZABBIX_VERSION_RC "" +#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 0eede8c9ba3..ab97a31740d 100644 --- a/src/go/pkg/version/version.go +++ b/src/go/pkg/version/version.go @@ -29,8 +29,8 @@ const ( ZABBIX_REVDATE = "14 March 2022" ZABBIX_VERSION_MAJOR = 6 ZABBIX_VERSION_MINOR = 0 - ZABBIX_VERSION_PATCH = 2 - ZABBIX_VERSION_RC = "" + ZABBIX_VERSION_PATCH = 3 + ZABBIX_VERSION_RC = "rc1" 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 d603b82a507..9b4a1796cf3 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 = "14 March 2022"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "6.0.2"; + static final String VERSION = "6.0.3rc1"; static void printVersion() { diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index f3d2ab9da39..cc65ddc52c3 100644 --- a/ui/include/defines.inc.php +++ b/ui/include/defines.inc.php @@ -18,8 +18,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -define('ZABBIX_VERSION', '6.0.2'); -define('ZABBIX_API_VERSION', '6.0.2'); +define('ZABBIX_VERSION', '6.0.3rc1'); +define('ZABBIX_API_VERSION', '6.0.3'); define('ZABBIX_EXPORT_VERSION', '6.0'); define('ZABBIX_DB_VERSION', 6000000); diff --git a/ui/tests/api_json/testAPIInfo.php b/ui/tests/api_json/testAPIInfo.php index f2c0bb925d9..6264b7fed5d 100644 --- a/ui/tests/api_json/testAPIInfo.php +++ b/ui/tests/api_json/testAPIInfo.php @@ -36,6 +36,6 @@ class testAPIInfo extends CAPITest { $this->disableAuthorization(); $result = $this->call('apiinfo.version', []); - $this->assertSame('6.0.2', $result['result']); + $this->assertSame('6.0.3', $result['result']); } } |