Commit Graph

1318 Commits

Author SHA1 Message Date
artica 475a56f6bd Auto-updated build strings. 2017-06-02 00:01:19 +02:00
artica 40cc85ab43 Auto-updated build strings. 2017-06-01 00:01:17 +02:00
artica 619014733b Auto-updated build strings. 2017-05-31 00:01:19 +02:00
artica 3b481af7d6 Updated version and build strings. 2017-05-30 11:22:26 +02:00
artica 05c9b7c4da Auto-updated build strings. 2017-05-30 00:01:17 +02:00
artica 0fe95248c1 Auto-updated build strings. 2017-05-29 00:01:13 +02:00
artica 63d3cefe0b Auto-updated build strings. 2017-05-28 00:01:12 +02:00
artica 5ca2065013 Auto-updated build strings. 2017-05-27 00:01:14 +02:00
artica 474d22ed30 Auto-updated build strings. 2017-05-26 00:01:14 +02:00
artica faa96927dd Auto-updated build strings. 2017-05-25 00:01:12 +02:00
artica 42704e5981 Auto-updated build strings. 2017-05-24 00:01:10 +02:00
artu30 37757f7ace Merge branch 'develop' into '596-default_event_filter_by_user'
# Conflicts:
#   pandora_console/godmode/users/configure_user.php
2017-05-23 09:48:37 +02:00
artica eddeb12bcf Auto-updated build strings. 2017-05-23 00:01:18 +02:00
artica 3b6272a7d2 Auto-updated build strings. 2017-05-22 00:01:14 +02:00
artica 7d7d5a9cec Auto-updated build strings. 2017-05-21 00:01:52 +02:00
artica 7749e7c08a Auto-updated build strings. 2017-05-20 00:01:16 +02:00
artica 8d16f573cc Auto-updated build strings. 2017-05-19 00:01:19 +02:00
artica 15b65ef3f8 Auto-updated build strings. 2017-05-18 00:01:18 +02:00
artica 24915e47cb Updated version and build strings. 2017-05-17 12:08:40 +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
artica 3d0c77709e Auto-updated build strings. 2017-05-12 00:01:25 +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
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
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
artica aa223aa583 Auto-updated build strings. 2017-04-26 00:01:15 +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 8c49cfffd7.
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
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
artica 40b3c318cd Auto-updated build strings. 2017-03-18 00:01:19 +01:00
artica a9cc5cd593 Auto-updated build strings. 2017-03-17 00:01:18 +01:00
artica 41072d8347 Auto-updated build strings. 2017-03-16 00:01:21 +01:00
artica 904e3142c8 Auto-updated build strings. 2017-03-15 00:01:18 +01:00
artica 4fb6a26365 Auto-updated build strings. 2017-03-14 00:01:18 +01:00
artica 7890d7bfea Auto-updated build strings. 2017-03-13 00:01:17 +01:00
artica 76fe1bbab6 Auto-updated build strings. 2017-03-12 00:01:18 +01:00
artica 9b45f46af5 Auto-updated build strings. 2017-03-11 00:01:19 +01:00
artica c3f3900ee5 Updated version and build strings for the 7.0NG release. 2017-03-10 11:10:28 +01:00
artica 67a31f8a70 Auto-updated build strings. 2017-03-10 00:01:21 +01:00
artica cfec08d075 Updated version string to 7.0NG_BETA to avoid problems with package managers. 2017-03-09 08:10:20 +01:00
artica b61f552649 Auto-updated build strings. 2017-03-09 00:01:19 +01:00
artica 342bcbb4ef Auto-updated build strings. 2017-03-08 00:01:20 +01:00
artica 03741b62d9 Auto-updated build strings. 2017-03-07 00:01:16 +01:00
artica cf5ade4972 Auto-updated build strings. 2017-03-06 09:13:26 +01:00
artica 5e1b14a75a Auto-updated build strings. 2017-03-03 00:01:30 +01:00