Arturo Gonzalez
|
1066124678
|
Merge branch 'develop' into 596-default_event_filter_by_user
Conflicts:
pandora_agents/unix/DEBIAN/control
pandora_agents/unix/DEBIAN/make_deb_package.sh
pandora_agents/unix/pandora_agent
pandora_agents/unix/pandora_agent.redhat.spec
pandora_agents/unix/pandora_agent.spec
pandora_agents/unix/pandora_agent_installer
pandora_agents/win32/installer/pandora.mpi
pandora_agents/win32/pandora.cc
pandora_agents/win32/versioninfo.rc
pandora_console/DEBIAN/control
pandora_console/DEBIAN/make_deb_package.sh
pandora_console/extras/mr/1.sql
pandora_console/include/config_process.php
pandora_console/install.php
pandora_console/pandora_console.redhat.spec
pandora_console/pandora_console.spec
pandora_server/DEBIAN/control
pandora_server/DEBIAN/make_deb_package.sh
pandora_server/lib/PandoraFMS/Config.pm
pandora_server/pandora_server.redhat.spec
pandora_server/pandora_server.spec
pandora_server/pandora_server_installer
pandora_server/util/pandora_db.pl
pandora_server/util/pandora_manage.pl
|
2017-04-18 11:28:02 +02:00 |