yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity
1,953 Commits 125 Branches 170 Tags
6d63befeb7ddc181c70c2b3446a033e4fe9e99cd
Commit Graph
265 Commits
Author SHA1 Message Date
vcerenu 37918b47cd Merge branch 'master' of github.com:wazuh/wazuh-docker into 4.9.0 2024-05-31 11:58:30 -03:00
vcerenu d59ee1bd35 merge 4.8.0 into 4.9.0 2024-05-31 11:00:50 -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
Gonzalo Acuña 3d7c673671 Merge pull request #1327 from wazuh/merge-4.9.0-into-master 
Merge 4.9.0 into master
 2024-04-30 08:21:30 -03:00
vcerenu 390a71ebea resolving conflicts 2024-04-30 07:03:06 -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
David Correa Rodríguez 4f0da7a58e Merge branch '4.9.0' into merge-4.9.0-into-master 2024-03-04 17:44:19 +01:00
David Correa Rodríguez f5b237458a Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-03-04 17:39:42 +01:00
David Correa Rodríguez 8d9d04adc5 Merge branch '4.8.1' into merge-4.8.1-into-4.8.2 2024-03-04 17:31:52 +01:00
David Correa Rodríguez 59e0ec54bd Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-03-04 17:10:56 +01: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 d3d2ae7b86 Bump version to 5.0.0 2024-02-13 10:32:58 +01:00
Gonzalo Acuña b6ebf179db Merge branch 'master' into merge-4.8.2-into-master 2024-01-04 15:03:16 -03:00
vcerenu 64ab19be1a bump 4.8.2 version 2024-01-04 10:01:05 -03:00
David Correa Rodríguez 5791218f83 Merge branch '4.8.1' into merge-4.8.1-into-master 2023-12-20 19:06:34 +01:00
David Correa Rodríguez 81b0172b37 Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2023-12-20 18:48:06 +01: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
David Correa Rodríguez 0ef3428788 Merge branch '4.8.1' into merge-4.8.1-into-master 2023-11-27 18:18:42 +01:00
David Correa Rodríguez 8002f2d402 Bump version to 4.8.1 2023-11-22 11:18:14 +01:00
Victor Ereñú dc167c2316 Merge pull request #1114 from wazuh/merge-4.8.0-into-master 
Merge 4.8.0 into master
 2023-11-14 08:08:04 -03:00
c-bordon 486c41e3f9 Updated security config files 2023-11-09 09:09:08 -03:00
Victor Ereñú ee9fdc383a Merge pull request #974 from DevinNorgarb/patch-1 
Fix typos in README.md
 2023-10-24 04:23:42 -03:00
Victor Ereñú 103c7e66df Merge pull request #1069 from wazuh/merge-4.8.0-into-master 
Merge 4.8.0 into master
 2023-10-23 05:48:29 -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 0d66cfbd5a Bump version to 4.9.0 2023-10-13 13:29:18 +02: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
Devin Norgarb 77c18adce5 Fix typos in README.md 
Just a few typos that needed to be addressed.
 2023-09-02 14:03:24 +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