4308 Commits

Author SHA1 Message Date
artica
24915e47cb Updated version and build strings. 2017-05-17 12:08:40 +02:00
vgilc
bd340f2327 Merge branch '854-no-estan-funcionando-modulos-snmp-mediante-wizard-interfaces' into 'develop'
Add support for auto IP addresses to SNMP modules.

See merge request !473
2017-05-17 09:26:51 +02:00
Ramon Novoa
c317fa478c Add support for auto IP addresses to SNMP modules. 2017-05-17 08:09:00 +02:00
artica
ead3556700 Auto-updated build strings. 2017-05-17 00:01:21 +02:00
artica
63cc6f5244 Auto-updated build strings. 2017-05-16 00:01:15 +02:00
artica
45239e4cdd Auto-updated build strings. 2017-05-15 00:01:14 +02:00
artica
31970c521d Auto-updated build strings. 2017-05-14 00:01:14 +02:00
artica
afff44138c Auto-updated build strings. 2017-05-13 00:01:16 +02:00
vgilc
03158ccc16 Merge branch 'weird-names-whe-apply-policies-7.0' into 'develop'
Calculate md5 checksums byte by byte, not char by char!

See merge request !464
2017-05-12 09:42:02 +02:00
artica
3d0c77709e Auto-updated build strings. 2017-05-12 00:01:25 +02:00
Ramon Novoa
6a83598c64 Calculate md5 checksums byte by byte, not char by char!
(cherry picked from commit dc4d144de8bcce8cc654515aefa0295ecb5065be)
2017-05-11 16:22:11 +02:00
artica
46e16f65ea Auto-updated build strings. 2017-05-11 00:01:21 +02:00
artica
71f8f29107 Auto-updated build strings. 2017-05-10 00:01:15 +02:00
artica
ce179c39aa Auto-updated build strings. 2017-05-09 00:01:18 +02:00
vgilc
93f6ad2e8d Merge branch '662-modulos-web-de-latencia-pasan-a-desconocido-ext-3807' into 'develop'
Add a default timeout for web modules. Ref artica/pandora_enterprise#662.

See merge request !437
2017-05-08 11:30:51 +02:00
artica
3865f13f8f Auto-updated build strings. 2017-05-08 00:01:14 +02:00
artica
3935442574 Auto-updated build strings. 2017-05-07 00:01:14 +02:00
artica
2c56de48f8 Auto-updated build strings. 2017-05-06 00:01:15 +02:00
Ramon Novoa
78e919a65e Add a default timeout for web modules. Ref artica/pandora_enterprise#662.
(cherry picked from commit e49400ae15c0afaca0324272ff46fc4091f4030b)
2017-05-05 14:43:35 +02:00
artica
02e1c6c8d2 Auto-updated build strings. 2017-05-05 00:01:17 +02:00
artica
96a13fe84c Auto-updated build strings. 2017-05-04 00:01:14 +02:00
artica
8b3102f29a Auto-updated build strings. 2017-05-03 00:01:14 +02:00
artica
026c498c46 Auto-updated build strings. 2017-05-02 00:01:14 +02:00
artica
186fc2422e Auto-updated build strings. 2017-05-01 00:01:14 +02:00
artica
17437c197f Auto-updated build strings. 2017-04-30 00:01:13 +02:00
artica
36dd55148a Auto-updated build strings. 2017-04-29 00:01:14 +02:00
artica
682b7938ab Auto-updated build strings. 2017-04-28 00:01:15 +02:00
artica
7493da21cc Auto-updated build strings. 2017-04-27 00:01:16 +02:00
daniel
bf2485ec25 fixed errors send email text-plain 2017-04-26 12:00:08 +02:00
artica
aa223aa583 Auto-updated build strings. 2017-04-26 00:01:15 +02:00
vgilc
d420c98560 Merge branch 'ent-515-Macro-para-SO' into 'develop'
Added macro _agentos_

See merge request !275
2017-04-25 16:18:00 +02:00
artica
4113369680 Updated version and build strings. 2017-04-25 15:35:09 +02:00
artica
d3f998b081 Auto-updated build strings. 2017-04-25 00:01:17 +02:00
artica
e32d353cc2 Revert "Updated version and build strings."
This reverts commit 8c49cfffd7b68dab8746940fe85f5507fe3ccc6b.
2017-04-24 15:59:34 +02:00
artica
8c49cfffd7 Updated version and build strings. 2017-04-24 15:39:47 +02:00
artica
0aa6835df7 Auto-updated build strings. 2017-04-24 00:01:12 +02:00
artica
37e1daca9f Auto-updated build strings. 2017-04-23 00:01:13 +02:00
artica
37fcc10551 Auto-updated build strings. 2017-04-22 00:01:56 +02:00
artica
f6faa4861b Auto-updated build strings. 2017-04-21 00:01:18 +02:00
artica
dd25cff4ec Auto-updated build strings. 2017-04-20 00:01:19 +02:00
artica
43993e1a14 Auto-updated build strings. 2017-04-19 00:01:21 +02:00
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
artica
e6a8f6afa2 Auto-updated build strings. 2017-04-18 00:01:21 +02:00
artica
9d0fde648a Auto-updated build strings. 2017-04-17 00:01:21 +02:00
artica
98f61b991a Auto-updated build strings. 2017-04-16 00:01:15 +02:00
artica
5f2884950d Auto-updated build strings. 2017-04-15 00:01:15 +02:00
artica
3dfdfad220 Auto-updated build strings. 2017-04-14 00:01:18 +02:00
artica
f081f81569 Auto-updated build strings. 2017-04-13 00:01:18 +02:00
artica
b3e1125526 Auto-updated build strings. 2017-04-12 00:01:17 +02:00
artica
ac738f682f Auto-updated build strings. 2017-04-11 00:01:17 +02:00