yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
1,905 Commits 125 Branches 170 Tags
c014ea77f48d0ffe8191d8dfc6cbada3175d2fb4
Commit Graph
246 Commits
Author SHA1 Message Date
Gonzalo Acuña f8b2399347 Bump to 4.8.1 2024-06-04 11:43:03 -03:00
Gonzalo Acuña 042d0bf075 Merge branch '4.8.0' into merge-4.7.5-into-4.8.0 2024-05-22 14:58:27 -03:00
vcerenu db89d2154f bump 4.7.5 version 2024-05-15 07:04:04 -03:00
vcerenu 4c74ebfc80 resolving conflicts 2024-04-30 05:39:50 -03:00
David Correa Rodríguez d904595787 Bumped version to 4.7.4 2024-04-18 15:16:32 +02:00
Gonzalo Acuña 96048c7bf3 Fix readme 4.7.3 2024-03-01 14:25:28 -03:00
vcerenu 5a5fbdd62c bump 4.7.3 version 2024-02-19 06:02:47 -03:00
David Correa Rodríguez eba8b9172f Merge branch '4.7.2' into merge-4.7.2-into-4.8.0 2023-12-20 18:23:15 +01:00
vcerenu d44b87800a bump revision number 2023-11-30 06:11:07 -03:00
c-bordon 486c41e3f9 Updated security config files 2023-11-09 09:09:08 -03:00
vcerenu 274c0bc692 resolving conflicts 2023-10-23 05:39:31 -03:00
vcerenu 781e6a4082 resolving conflicts 2023-10-23 05:25:42 -03:00
Victor Ereñú 0c7d298eea Merge pull request #1066 from wazuh/merge-4.6.0-into-4.7.0 
Merge 4.6.0 into 4.7.0
 2023-10-23 05:21:47 -03:00
vcerenu c46b1c0d82 resolving conflicts 2023-10-23 05:02:02 -03:00
vcerenu 5106715b0c bump 4.5.4 version 2023-10-17 05:55:15 -03:00
David Correa Rodríguez d8f7fd6767 Merge remote-tracking branch 'origin/4.7.1' into merge-4.7.1-into-master 2023-09-22 12:47:11 +02:00
David Correa Rodríguez d449ae7f76 Bump version to 4.7.1 2023-09-20 11:01:19 +02:00
David Correa Rodríguez 9253127ce8 Merge branch '4.7.0' into merge-4.7.0-into-master 2023-09-07 16:21:42 +02:00
David Correa Rodríguez 2234517218 Merge branch '4.6.0' into merge-4.6.0-into-4.7.0 2023-09-07 14:41:11 +02:00
David Correa Rodríguez 9a871dbbcb Merge branch '4.5.3' into merge-4.5.3-into-4.6.0 2023-09-07 13:39:58 +02:00
David Correa Rodríguez e5abd5d24e Bump to 4.5.3 2023-08-29 11:29:26 +02:00
Gonzalo Acuña fc4cef1072 Merge pull request #900 from wazuh/merge-4.7.0-into-master 
Merge `4.7.0` into `master`
 2023-07-21 10:23:53 -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 f2dab81387 Merge branch '4.6.0' into merge-4.5.2-into-4.6.0 2023-07-21 08:15:57 -03:00
vcerenu 54975ab099 Bump to 4.5.2 2023-07-19 08:43:17 -03:00
vcerenu 919500bd74 bump master to 4.8.0 2023-07-14 16:22:52 -03:00
vcerenu a0899a8358 resolving merge conflicts 2023-07-11 12:17:06 -03:00
vcerenu 4d0aa57ed2 resolving merge conflicts 2023-07-11 11:49:32 -03:00
vcerenu 247555b1b6 resolving merge conflicts 2023-07-11 11:21:00 -03:00
vcerenu 0f65448718 resolving merge conflicts 2023-07-11 09:41:16 -03:00
Gonzalo Acuña 55ee49aff5 Bumped to 4.4.5 2023-07-07 08:39:57 -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
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 303b64c7ae Merge branch '4.5' into merge-4.4.5-into-4.5 2023-06-14 15:16:14 -03:00
Gonzalo Acuña 41196a5529 Bump to 4.4.5 2023-06-05 11:44:32 -03:00
Gonzalo Acuña e2e95a5c57 Bump to 4.4.4 2023-06-05 11:38:58 -03: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 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 820079f1d0 Bump to 4.4.3 2023-05-25 20:03:26 +02: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 7427eff847 Added missing config 2023-05-18 22:14:26 +02:00
vcerenu dd46f8a2c1 bump 4.6 version 2023-05-18 22:06:21 +02:00
vcerenu 697b7538cc bump release 4.5.0 2023-05-18 22:04:56 +02:00
vcerenu 638d548d74 bump 4.4.1 version 2023-05-18 22:04:21 +02:00
Gonzalo Acuña 944c6aa4c8 Revert "Bump 4.4 to 4.4.1" 2023-05-18 22:04:19 +02:00
vcerenu 5e3676e125 bump 4.4.1 version 2023-05-18 22:04:18 +02:00
Alberto R 3525003ef7 Bumped to 4.4.0 2023-05-18 22:03:03 +02:00