diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | frontends/php/include/config.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 2 | ||||
| -rw-r--r-- | include/common.h | 4 | ||||
| -rwxr-xr-x | misc/snmptrap/snmptrap.sh | 2 | ||||
| -rw-r--r-- | src/zabbix_agent_win32/zabbixw32.h | 2 |
6 files changed, 7 insertions, 6 deletions
@@ -1,5 +1,6 @@ Changes for 1.1: + - fixed syntax in snmptrap.sh (Alexei) - fixed EventLog for Win32 ZABBIX agent, thanks to "bcheese" (Eugene) - developed aggrgated graphs (Eugene) - improved graphs, added selector of data calculation function (Eugene) diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 65d8a719..24bc3147 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -852,7 +852,7 @@ COpt::profiling_start("page"); <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo S_HTML_CHARSET; ?>"> -<meta name="Author" content="Alexei Vladishev, Eugene Grigorjev"> +<meta name="Author" content="ZABBIX SIA (Alexei Vladishev, Eugene Grigorjev)"> <link rel="stylesheet" href="css.css"> <?php // if($USER_DETAILS['alias']=='guest') diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index 500de240..2d2e3b2f 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -280,7 +280,7 @@ "S_COMPARE"=> "Compare", // Footer - "S_ZABBIX_VER"=> "ZABBIX 1.1beta12", + "S_ZABBIX_VER"=> "ZABBIX 1.1", "S_COPYRIGHT_BY"=> "Copyright 2001-2006 by ", "S_CONNECTED_AS"=> "Connected as", "S_SIA_ZABBIX"=> "SIA Zabbix", diff --git a/include/common.h b/include/common.h index fabde053..16276c26 100644 --- a/include/common.h +++ b/include/common.h @@ -118,8 +118,8 @@ #define ZBX_FS_DBL "%f" -#define ZABBIX_REVDATE "23 May 2006" -#define ZABBIX_VERSION "1.1beta12" +#define ZABBIX_REVDATE "2 Juna 2006" +#define ZABBIX_VERSION "1.1" #define MAX_LOG_FILE_LEN (1024*1024) diff --git a/misc/snmptrap/snmptrap.sh b/misc/snmptrap/snmptrap.sh index f04f160e..d0e554fe 100755 --- a/misc/snmptrap/snmptrap.sh +++ b/misc/snmptrap/snmptrap.sh @@ -49,4 +49,4 @@ community=`echo $community|cut -f2 -d'"'` str="$hostname $address $community $enterprise $oid" -$ZABBIX_SENDER $ZABBIX_SERVER $ZABBIX_PORT $HOST:$KEY "$str" +$ZABBIX_SENDER $ZABBIX_SERVER $ZABBIX_PORT $HOST $KEY "$str" diff --git a/src/zabbix_agent_win32/zabbixw32.h b/src/zabbix_agent_win32/zabbixw32.h index 417ec5cd..271660c2 100644 --- a/src/zabbix_agent_win32/zabbixw32.h +++ b/src/zabbix_agent_win32/zabbixw32.h @@ -43,7 +43,7 @@ #else #define DEBUG_SUFFIX #endif -#define AGENT_VERSION "1.1beta12" DEBUG_SUFFIX +#define AGENT_VERSION "1.1" DEBUG_SUFFIX #define ZABBIX_SERVICE_NAME "ZabbixAgentdW32" #define ZABBIX_EVENT_SOURCE "Zabbix Win32 Agent" |