paulmataruso/wazuh-docker-orginal
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-docker.git synced 2025-11-16 03:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,563 Commits 95 Branches 158 Tags
7312f86235202d5244f05f34bff6aa3af9e7cb15
Commit Graph

1563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vcerenu
221c3ccd24 add ulimit parameter to wazuh manager deploy 2023-07-31 13:19:13 -03:00
vcerenu
1ff589ccaf add ulimit parameter to wazuh manager deploy 2023-07-31 13:16:15 -03:00
Victor Ereñú
d4c98491fc Merge pull request #910 from wazuh/909-deprecate-update_from_year-to-use-nvd-api-20-feeds 
Delete update_from_year parameter
 2023-07-26 13:55:52 -03:00
vcerenu
673c28b637 delete update_from_year parameter 2023-07-26 13:40:54 -03:00
Gonzalo Acuña
7d3bea67f7 Merge pull request #899 from wazuh/merge-4.6.0-into-4.7.0 
Merge `4.6.0` into `4.7.0`
 2023-07-21 10:07:45 -03:00
Gonzalo Acuña
3953986652 Merge pull request #898 from wazuh/merge-4.5.2-into-4.6.0 
Merge `4.5.2` into `4.6.0`
 2023-07-21 08:27:24 -03:00
Gonzalo Acuña
f2dab81387 Merge branch '4.6.0' into merge-4.5.2-into-4.6.0 2023-07-21 08:15:57 -03:00
Gonzalo Acuña
da82008a75 Merge pull request #894 from wazuh/bump-4.5.2 
Bump to 4.5.2
 2023-07-19 08:55:24 -03:00
vcerenu
54975ab099 Bump to 4.5.2 2023-07-19 08:43:17 -03:00
Victor Ereñú
a9d505b316 Merge pull request #887 from wazuh/merge-4.6.0-into-master 
Merge 4.6.0 into master
 2023-07-11 12:20:01 -03:00
vcerenu
a0899a8358 resolving merge conflicts 2023-07-11 12:17:06 -03:00
Carlos Bordon
b27d991f0c Merge pull request #886 from wazuh/merge-4.5.1-into-4.6.0 
Merge 4.5.1 into 4.6.0
 2023-07-11 12:04:34 -03:00
vcerenu
4d0aa57ed2 resolving merge conflicts 2023-07-11 11:49:32 -03:00
Carlos Bordon
1a75d4eb77 Merge pull request #885 from wazuh/merge-4.5.0-into-4.5.1 
Merge 4.5.0 into 4.5.1
 2023-07-11 11:34:52 -03:00
vcerenu
247555b1b6 resolving merge conflicts 2023-07-11 11:21:00 -03:00
Carlos Bordon
442d457933 Merge pull request #884 from wazuh/merge-4.4-into-4.5.0 
Merge 4.4 into 4.5.0
 2023-07-11 10:42:52 -03:00
vcerenu
0f65448718 resolving merge conflicts 2023-07-11 09:41:16 -03:00
Victor Ereñú
a9533264d6 Merge pull request #883 from wazuh/merge-4.4.5-into-4.4 
Merge 4.4.5 into 4.4
 2023-07-11 09:26:12 -03:00
Carlos Bordon
ce8dd29425 Merge pull request #879 from wazuh/4.4.5-bump-revision 
Bump revision
v4.4.5 		2023-07-10 09:00:24 -03:00
vcerenu
a433989865 bump revision 2023-07-10 08:42:14 -03:00
Gonzalo Acuña
ff1e5f991a Merge pull request #878 from wazuh/bump-4.4.5 
Bump to 4.4.5
 2023-07-07 08:48:54 -03:00
Gonzalo Acuña
55ee49aff5 Bumped to 4.4.5 2023-07-07 08:39:57 -03:00
Gonzalo Acuña
75f92308a1 Merge pull request #877 from wazuh/merge-4.4.4-into-4.4 
Merge `4.4.4` into `4.4`
 2023-07-07 08:32:11 -03:00
Victor Ereñú
61c37a78de Merge pull request #874 from wazuh/bump-4-5-1 
Bump version 4.5.1
 2023-06-26 14:07:42 -03:00
vcerenu
39208c513c bump version 4.5.1 2023-06-26 13:35:29 -03:00
vcerenu
3650feeb0e bump version 4.5.0 2023-06-26 09:40:14 -03:00
Victor Ereñú
f4f99f17b7 Merge pull request #872 from wazuh/bump-4-6 
Bump 4.6 version
v4.6.0-pre-alpha1 		2023-06-23 12:36:30 -03:00
David Jose Iglesias Lopez
3c9b5ac717 Merge pull request #871 from wazuh/bump-4-7 
Bump 4.7 version
 2023-06-23 16:29:44 +02:00
vcerenu
8e3b8aada8 bump 4.6 version 2023-06-23 10:33:35 -03:00
vcerenu
6a98b87b8e bump 4.7 version 2023-06-22 17:26:55 -03:00
Gonzalo Acuña
56dbf052c9 Merge pull request #867 from wazuh/merge-4.5-into-master 
Merge `4.5` into `master`
 2023-06-14 16:36:31 -03:00
Gonzalo Acuña
7abaea9b4c Merge pull request #866 from wazuh/merge-4.4.5-into-4.5 
Merge `4.4.5` into `4.5`
 2023-06-14 15:48:43 -03:00
Gonzalo Acuña
303b64c7ae Merge branch '4.5' into merge-4.4.5-into-4.5 2023-06-14 15:16:14 -03:00
Gonzalo Acuña
2340db4079 Merge pull request #865 from wazuh/merge-4.4-into-4.4.5 
Merge `4.4` into `4.4.5`
 2023-06-14 14:50:59 -03:00
Gonzalo Acuña
9159eda943 Merge branch '4.4.5' into merge-4.4-into-4.4.5 2023-06-14 14:07:23 -03:00
Gonzalo Acuña
d278782134 Merge pull request #858 from wazuh/merge-4-4-4-to-4-4 
Bump `4.4` to `4.4.4`
 2023-06-13 15:58:51 -03:00
Gonzalo Acuña
77725b7eb2 Revision bump 2023-06-13 13:19:35 -03:00
Gonzalo Acuña
4e7c2cf72a Revision bump v4.4.4 2023-06-12 09:38:35 -03:00
Gonzalo Acuña
41196a5529 Bump to 4.4.5 2023-06-05 11:44:32 -03:00
Gonzalo Acuña
8ce1f36f10 Revision update 2023-06-05 11:42:10 -03:00
Gonzalo Acuña
e2e95a5c57 Bump to 4.4.4 2023-06-05 11:38:58 -03:00
Raul Del Pozo Moreno
1238820b6c Merge pull request #854 from wazuh/master-merge-4.5 
Merge `4.5` into `master`
 2023-05-29 18:09:23 +02:00
Raul Del Pozo Moreno
f168bd62fe Merge remote-tracking branch 'origin/4.5' into master-merge-4.5 2023-05-29 16:36:14 +02:00
Raul Del Pozo Moreno
2058734154 Merge pull request #853 from wazuh/4.5-merge-4.4 
Merge `4.4` into `4.5`
 2023-05-29 16:34:48 +02:00
Raul Del Pozo Moreno
4e34f1f7b7 Merge remote-tracking branch 'origin/4.4' into 4.5-merge-4.4 2023-05-26 18:51:03 +02:00
Raul Del Pozo Moreno
b259665fc6 Merge pull request #851 from wazuh/bump-4.4.3 
Bump `4.4` to `4.4.3`
v4.4.3 		2023-05-26 14:13:58 +02:00
Raul Del Pozo Moreno
820079f1d0 Bump to 4.4.3 2023-05-25 20:03:26 +02:00
Gonzalo Acuña
efc8ab88df Merge pull request #848 from wazuh/merge-4.5-master 
Merge 4.5 into master
 2023-05-22 09:56:01 -03:00
Raul Del Pozo Moreno
f71616939e Merge remote-tracking branch 'origin/4.5' into merge-4.5-master 2023-05-18 22:43:04 +02:00
Raul Del Pozo Moreno
9a9fac6243 Merge pull request #847 from wazuh/merge-4.4-4.5 
Merge `4.4` into `4.5`
 2023-05-18 22:38:07 +02:00