From d90290030dcd7e46f8087ae2e9771c38a56fcdb3 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Wed, 1 Dec 2010 11:32:47 +0000 Subject: [PATCH] 2010-12-01 Ramon Novoa * unix/AIX/pandora_agent.conf, unix/pandora_agent, win32/ChangeLog, win32/installer/pandora.mpi, win32/pandora.cc: Updated version strings. * win32/bin/PandoraAgent.exe: Updated to r3644. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3645 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/ChangeLog | 8 ++++++++ pandora_agents/unix/AIX/pandora_agent.conf | 2 +- pandora_agents/unix/pandora_agent | 4 ++-- pandora_agents/win32/ChangeLog | 10 ++++++++++ pandora_agents/win32/bin/PandoraAgent.exe | Bin 4053135 -> 4053135 bytes pandora_agents/win32/installer/pandora.mpi | 4 ++-- pandora_agents/win32/pandora.cc | 2 +- 7 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index 7b7bab186b..3f82c198f4 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,3 +1,11 @@ +2010-12-01 Ramon Novoa + + * unix/AIX/pandora_agent.conf, unix/pandora_agent, + win32/ChangeLog, win32/installer/pandora.mpi, + win32/pandora.cc: Updated version strings. + + * win32/bin/PandoraAgent.exe: Updated to r3644. + 2010-11-25 Sancho Lerena * pandora_agents/unix/pandora_agent.spec: Updated version diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index bf0476251e..7145f5dc0f 100755 --- a/pandora_agents/unix/AIX/pandora_agent.conf +++ b/pandora_agents/unix/AIX/pandora_agent.conf @@ -139,7 +139,7 @@ module_end module_begin module_name Pandora_Agent_RAM -module_ẗype generic_data +module_type generic_data module_exec ps axu | grep perl | grep -v grep | awk '{ print $4 }' | tr "," "." module_end diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 16895b0eb3..b761d6188c 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,8 +55,8 @@ if (!$@) { threads::shared::share (\$Sem); } -use constant AGENT_VERSION => '3.2RC1'; -use constant AGENT_BUILD => '101103'; +use constant AGENT_VERSION => '3.2RC2'; +use constant AGENT_BUILD => '101125'; # Commands to retrieve total memory information in kB use constant TOTALMEMORY_CMDS => { diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index 3e512fcf21..5c3de06044 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,13 @@ +2010-12-01 Ramon Novoa + + * bin/PandoraAgent.exe: + + * installer/pandora.mpi, pandora.cc: Updated version strings. + +2010-11-29 Ramon Novoa + + * bin/util/pandora_update.exe: Give the agent service some time to stop. + 2010-11-18 Ramon Novoa * bin/PandoraAgent.exe: Updated to r3583. diff --git a/pandora_agents/win32/bin/PandoraAgent.exe b/pandora_agents/win32/bin/PandoraAgent.exe index 0528b8ba14de470bdef3a7a9d51bbcbd8a49de47..c0f2afa86f43489d56cccb651068d9cf273a7949 100755 GIT binary patch delta 6232 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 delta 6230 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 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index bc628fa96b..e30333e846 100755 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -3,7 +3,7 @@ AllowLanguageSelection {Yes} AppName -{Pandora FMS Windows Agent v3.2} +{Pandora FMS Windows Agent v3.2RC2} ApplicationID {17E3D2CF-CA02-406B-8A80-9D31C17BD08F} @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{RC2 (101028)} +{101125} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 9423814fad..751cba7d34 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("3.2 RC1 (Build 101029)") +#define PANDORA_VERSION ("3.2RC2(Build 101125)") string pandora_path; string pandora_dir;