diff options
| author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2016-09-12 15:26:21 +0300 |
|---|---|---|
| committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2016-09-12 15:26:21 +0300 |
| commit | 3d8c40e7fb0b1d51dfa6e696231c43e176d56d16 (patch) | |
| tree | d4a711539bb2fe1305afa553e3c65f6dc490ffb0 | |
| parent | 972d2eb6b3b4850bdfcbb9f6de0499e4e13dca90 (diff) | |
.......... [ZBXNEXT-826] updated release date and version [3.2.0]
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | frontends/php/include/defines.inc.php | 2 | ||||
| -rw-r--r-- | include/version.h | 4 | ||||
| -rw-r--r-- | src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java | 4 |
5 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index c5682552d4d..6bae7ea55da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes for 3.2.0 + +3.2.0rc2 was released as 3.2.0 without any changes + +-------------------------------------------------------------------------------- Changes for 3.2.0rc2 Bug fixes: diff --git a/configure.ac b/configure.ac index 47b061ff2fc..f68910963dd 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],[3.2.0rc2]) +AC_INIT([Zabbix],[3.2.0]) AC_CONFIG_SRCDIR(src/zabbix_server/server.c) AM_INIT_AUTOMAKE diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index 2e0aff7ca45..645e99fcc8f 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -19,7 +19,7 @@ **/ -define('ZABBIX_VERSION', '3.2.0rc2'); +define('ZABBIX_VERSION', '3.2.0'); define('ZABBIX_API_VERSION', '3.2.0'); define('ZABBIX_EXPORT_VERSION', '3.2'); define('ZABBIX_DB_VERSION', 3020000); diff --git a/include/version.h b/include/version.h index f0499ba1919..9e75a41fa00 100644 --- a/include/version.h +++ b/include/version.h @@ -24,12 +24,12 @@ #define ZBX_STR(str) ZBX_STR2(str) #define APPLICATION_NAME "Zabbix Agent" -#define ZABBIX_REVDATE "12 September 2016" +#define ZABBIX_REVDATE "13 September 2016" #define ZABBIX_VERSION_MAJOR 3 #define ZABBIX_VERSION_MINOR 2 #define ZABBIX_VERSION_PATCH 0 #define ZABBIX_VERSION_REVISION {ZABBIX_REVISION} -#define ZABBIX_VERSION_RC "rc2" +#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/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java index ae695700e95..8c578abbe21 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 { public static final String APPLICATION_NAME = "Zabbix Java Gateway"; - public static final String REVISION_DATE = "12 September 2016"; + public static final String REVISION_DATE = "13 September 2016"; public static final String REVISION = "{ZABBIX_REVISION}"; - public static final String VERSION = "3.2.0rc2"; + public static final String VERSION = "3.2.0"; public static void printVersion() { |