Merge remote-tracking branch 'forge/2.2.x' into 2.2.x

fusioninventory · Jan 18, 2012 · 0e95737 · 0e95737
2 parents 0d7c459 + e2a82c9
commit 0e95737
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@ lib/FusionInventory/Agent/Task/SNMPQuery
 lib/FusionInventory/Agent/Task/Deploy
 lib/FusionInventory/Agent/Task/Deploy.pm
 lib/FusionInventory/Agent/Task/ESX.pm
+lib/FusionInventory/Agent/SNMP.pm
 pm_to_blib
 ./README
 *~

diff --git a/lib/FusionInventory/Agent.pm b/lib/FusionInventory/Agent.pm
@@ -21,7 +21,7 @@ use FusionInventory::Agent::Tools;
 use FusionInventory::Agent::Tools::Hostname;
 use FusionInventory::Agent::XML::Query::Prolog;
 
-our $VERSION = '2.1.9903';
+our $VERSION = '2.1.9904';
 our $VERSION_STRING = 
     "FusionInventory unified agent for UNIX, Linux and MacOSX ($VERSION)";
 our $AGENT_STRING =

diff --git a/tools/createExtLinks.sh b/tools/createExtLinks.sh
@@ -17,6 +17,10 @@ done
 if [ ! -e lib/FusionInventory/VMware ]; then
     ln -s $PWD/../agent-task-esx/lib/FusionInventory/VMware lib/FusionInventory/
 fi
+if [ ! -e lib/FusionInventory/Agent/SNMP.pm ]; then
+    ln -s $PWD/../agent-task-netdiscovery/lib/FusionInventory/Agent/SNMP.pm lib/FusionInventory/Agent/SNMP.pm
+fi
+
 if [ ! -e fusioninventory-esx ]; then
     ln -s $PWD/../agent-task-esx/fusioninventory-esx .
 fi