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 0528b8ba14..c0f2afa86f 100755 Binary files a/pandora_agents/win32/bin/PandoraAgent.exe and b/pandora_agents/win32/bin/PandoraAgent.exe differ 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;