From c79686349515e401e4619503d8991eca5785e570 Mon Sep 17 00:00:00 2001 From: darode Date: Fri, 20 Apr 2012 10:37:09 +0000 Subject: [PATCH] 2012-04-20 Dario Rodriguez * pandora_agents/win32/bin/pandora_agent.conf: Added more inventory parameters to inventory module MERGED FROM 4.0.2 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6062 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/ChangeLog | 7 +++++++ pandora_agents/win32/bin/pandora_agent.conf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index b3cd330047..1186973d89 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,3 +1,10 @@ +2012-04-20 Dario Rodriguez + + * pandora_agents/win32/bin/pandora_agent.conf: Added more inventory + parameters to inventory module + + MERGED FROM 4.0.2 + 2012-04-19 Dario Rodriguez * win32/bin/pandora_agent.conf: Added sencodary server parameters example diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index d8f2c64b73..2f09df4058 100644 --- a/pandora_agents/win32/bin/pandora_agent.conf +++ b/pandora_agents/win32/bin/pandora_agent.conf @@ -108,7 +108,7 @@ xml_buffer 0 #module_name Inventory #module_interval 7 #module_type generic_data_string -#module_inventory RAM Patches Software Services NIC +#module_inventory CPU RAM CDROM Video HD Patches Software Services NIC #module_description Inventory #module_end