5042 Commits

Author SHA1 Message Date
artica
aa223aa583 Auto-updated build strings. 2017-04-26 00:01:15 +02:00
vgilc
d10b0906ec Merge branch '141-cli-pandora-create_data_module' into 'develop'
fixed error cli pandora-create_data_module

See merge request !405
2017-04-25 17:17:39 +02:00
artica
4113369680 Updated version and build strings. 2017-04-25 15:35:09 +02:00
daniel
f6290d25fa fixed error cli pandora-create_data_module 2017-04-25 13:48:17 +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
Daniel Maya
3f6adf9f65 Fixed error in cron 2017-04-24 12:39:11 +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
Shigekazu Aoyagi
200b821a20 add defined check for $conf->{'_inventory_purge'} 2017-04-11 03:37:23 +00:00
Shigekazu Aoyagi
311ac744c6 move logging $conf->{'_days_delete_unknown'} after defined checking 2017-04-11 03:35:12 +00:00
Shigekazu Aoyagi
fc357b8c14 add initialize $conf->{'verbosity'} when not defined config file. 2017-04-11 03:32:58 +00:00
artica
ac738f682f Auto-updated build strings. 2017-04-11 00:01:17 +02:00
artica
ea6deaea04 Auto-updated build strings. 2017-04-10 08:54:41 +02:00
artica
b3d6575176 Auto-updated build strings. 2017-04-10 00:01:18 +02:00
artica
20caf87fd5 Auto-updated build strings. 2017-04-09 00:01:19 +02:00
artica
16b0bc83a1 Auto-updated build strings. 2017-04-08 00:01:18 +02:00
artica
6b0d42c4a4 Auto-updated build strings. 2017-04-07 00:01:16 +02:00
artica
37142657a5 Auto-updated build strings. 2017-04-06 00:01:16 +02:00
artica
d25dc0b13a Auto-updated build strings. 2017-04-05 00:01:20 +02:00
artica
6039772b20 Auto-updated build strings. 2017-04-04 00:01:19 +02:00
artica
b769531d16 Auto-updated build strings. 2017-04-03 00:01:17 +02:00
artica
6ca2d24786 Auto-updated build strings. 2017-04-02 00:01:18 +02:00
artica
1121f8ffc5 Auto-updated build strings. 2017-04-01 00:01:18 +02:00
artica
3d1bdc799e Auto-updated build strings. 2017-03-31 00:01:19 +02:00
artica
da17532889 Auto-updated build strings. 2017-03-30 00:01:18 +02:00
artica
a6a9f7eff4 Auto-updated build strings. 2017-03-29 00:01:21 +02:00
artica
f81998b294 Auto-updated build strings. 2017-03-28 00:01:18 +02:00
artica
10b145463f Auto-updated build strings. 2017-03-27 00:01:16 +02:00
artica
149e8be750 Auto-updated build strings. 2017-03-26 00:01:17 +01:00
artica
d1c4512977 Auto-updated build strings. 2017-03-25 00:01:19 +01:00
artica
bac8b24853 Auto-updated build strings. 2017-03-24 00:01:21 +01:00
artica
db7d154aa9 Auto-updated build strings. 2017-03-23 00:01:20 +01:00
artica
dc085fa339 Auto-updated build strings. 2017-03-22 00:01:19 +01:00
artica
e6ffb47535 Auto-updated build strings. 2017-03-21 00:01:17 +01:00
artica
53837de343 Auto-updated build strings. 2017-03-20 00:01:18 +01:00
artica
6610391bc3 Auto-updated build strings. 2017-03-19 00:01:15 +01:00