Commit Graph

2488 Commits

Author SHA1 Message Date
David Correa Rodríguez
8b3cd4ce9d
Merge branch '4.7.1' into merge-4.7.1-into-master 2023-10-09 11:07:47 +02:00
Victor Ereñú
77bc6df962
Merge pull request #1064 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-10-09 06:04:32 -03:00
David Correa Rodríguez
3ee126247e
Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-10-09 10:50:11 +02:00
Victor Ereñú
b3019d294f
Merge pull request #1063 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-10-09 05:34:06 -03:00
David Correa Rodríguez
2c72529f7f
Merge 4.6.0 into 4.7.0 2023-10-09 09:41:25 +02:00
c-bordon
3c9afa2936
Fixed create user py script 2023-10-06 10:31:37 -03:00
c-bordon
7ebfe2c2ad
Fixed create_user.py 2023-10-06 10:15:10 -03:00
Gonzalo Acuña
b0ae50aeda
Merge pull request #1061 from wazuh/bump-revision-4.6.0
Bump revision to 40602
2023-10-06 09:15:06 -03:00
David Correa Rodríguez
97a307a5ed
Bump revision to 40602 2023-10-06 14:11:05 +02:00
Gonzalo Acuña
0b222bbbf9
Merge pull request #1056 from wazuh/bump-4.5.3-revision
Bump 4.5.3 revision
2023-10-05 11:45:57 -03:00
Gonzalo Acuña
3c191ede71
Bump 4.5.3 revision 2023-10-05 11:41:33 -03:00
c-bordon
d327883df7
Testing after removing build from sources 2023-10-05 11:14:06 -03:00
David Correa Rodríguez
4ef5c37970
Agent package is downloaded and deleted 2023-10-03 17:16:38 +02:00
David Correa Rodríguez
e1568d00eb
Initial macOS tasks created 2023-10-03 17:05:22 +02:00
David Correa Rodríguez
af5b41ad29
Initial variables created 2023-10-03 17:04:35 +02:00
Gonzalo Acuña
01cebe1c96
Merge pull request #1048 from wazuh/change/1039-bump-revision-4.5.3-rc2
Bump revision to 40507
2023-09-28 08:24:41 -03:00
David Correa Rodríguez
838d81f146
Bump revision to 40507 2023-09-28 12:10:56 +02:00
Gonzalo Acuña
676fce7ab8
Merge pull request #1045 from wazuh/bump-4.6.0-revision
Revision bump
2023-09-22 14:58:53 -03:00
Gonzalo Acuña
6b6f6e19d3
Revision bump 2023-09-22 14:53:30 -03:00
Gonzalo Acuña
a9e12d7c8b
Merge pull request #1043 from wazuh/merge-4.7.1-into-master
Merge 4.7.1 into master
2023-09-22 07:49:24 -03:00
David Correa Rodríguez
237a5de1c8
Added empty line in CHANGELOG.md 2023-09-22 12:48:59 +02:00
David Correa Rodríguez
c1bcd06057
Merge remote-tracking branch 'origin/4.7.1' into merge-4.7.1-into-master 2023-09-22 12:39:45 +02:00
Gonzalo Acuña
36450e726d
Merge pull request #1042 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-09-22 07:20:46 -03:00
David Correa Rodríguez
8a6d1a4e8d
Updated wazuh_template_branch variable 2023-09-22 12:12:19 +02:00
David Correa Rodríguez
caca90e597
Merge remote-tracking branch 'origin/4.7.0' into merge-4.7.0-into-4.7.1 2023-09-22 12:11:37 +02:00
David Correa Rodríguez
0f773bee06
Merge remote-tracking branch 'origin/4.7.0' into merge-4.7.0-into-4.7.1 2023-09-22 12:10:13 +02:00
Gonzalo Acuña
f4e946892d
Merge pull request #1041 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-09-22 06:49:12 -03:00
David Correa Rodríguez
3bb70029d0
Merge remote-tracking branch 'origin/4.6.0' into merge-4.6.0-into-4.7.0 2023-09-22 11:46:51 +02:00
Gonzalo Acuña
2489001bf7
Merge pull request #1018 from wazuh/17617-vdt-alas2023-support
Add Amazon Linux 2023 VDT default configuration
2023-09-21 11:01:08 -03:00
Gonzalo Acuña
889e99ee24
Merge pull request #1038 from wazuh/idr-263-security-policy
Create SECURITY.md
2023-09-20 08:58:12 -03:00
David Correa Rodríguez
ea3ded19fd
Create SECURITY.md
Wazuh security policy added.
Related: https://github.com/wazuh/internal-devel-requests/issues/263
2023-09-20 13:52:51 +02:00
Gonzalo Acuña
53ec242bd3
Merge pull request #1036 from wazuh/bump-version-4.7.1
Bump version to 4.7.1
2023-09-20 08:15:11 -03:00
David Correa Rodríguez
035bf984c8
Bump version to 4.7.1 2023-09-20 11:08:28 +02:00
Leonardo Quiceno
75c124f471
Add Amazon Linux 2023 VDT support 2023-09-18 11:30:52 -05:00
Gonzalo Acuña
3022a80c68
Merge pull request #1033 from wazuh/bug/1030-fix-wazuh-template-config-file
Fixed `wazuh_template_branch` and `config.yml` template name for `4.6.0`
2023-09-11 15:08:34 -03:00
Gonzalo Acuña
522b7ff358
Merge pull request #1031 from wazuh/merge-4.7.0-into-master
Merge `4.7.0` into `master`
2023-09-07 11:28:59 -03:00
David Correa Rodríguez
2c128f9ab0
Merge branch '4.7.0' into merge-4.7.0-into-master 2023-09-07 16:21:42 +02:00
Gonzalo Acuña
ca4ce70d6c
Merge pull request #1029 from wazuh/merge-4.6.0-into-4.7.0
Merge `4.6.0` into `4.7.0`
2023-09-07 10:42:28 -03:00
David Correa Rodríguez
aeff17a189
Merge branch '4.6.0' into merge-4.6.0-into-4.7.0 2023-09-07 14:41:11 +02:00
Gonzalo Acuña
2de883e846
Minor branch updated 2023-09-07 09:38:42 -03:00
Gonzalo Acuña
b7283655a2
Merge pull request #1028 from wazuh/merge-4.5.3-into-4.6.0
Merge `4.5.3` into `4.6.0`
2023-09-07 08:58:07 -03:00
David Correa Rodríguez
561bd9aa41
Merge branch '4.5.3' into merge-4.5.3-into-4.6.0 2023-09-07 13:52:24 +02:00
Gonzalo Acuña
ca67cc5ceb
Merge pull request #1026 from wazuh/merge-4.5.2-into-4.5.3
Merge `4.5.2` into `4.5.3`
2023-09-07 08:11:37 -03:00
David Correa Rodríguez
12a59cde52
Merge branch '4.5.2' into merge-4.5.2-into-4.5.3 2023-09-07 10:33:47 +02:00
Gonzalo Acuña
53ccf753be
Merge pull request #1022 from wazuh/4.5.2-md5
4.5.2 MD5 update
2023-09-06 14:11:24 -03:00
Gonzalo Acuña
64d3bccb5d
MD5 for 4.5.2 updated 2023-09-06 13:41:35 -03:00
David Correa Rodríguez
194aa380fb
Merge pull request #1020 from wazuh/bump-revision-40505
Bump revision to 40505
2023-09-04 11:53:42 +02:00
David Correa Rodríguez
e18970afff
Bump revision to 40505 2023-09-04 11:11:07 +02:00
Gonzalo Acuña
ed82a8b91f
Merge pull request #1017 from wazuh/merge-4.5.3-into-4.6.0
Merge `4.5.3` into `4.6.0`
2023-08-31 14:53:37 -03:00
Gonzalo Acuña
6bb6e713ee
Merge branch '4.6.0' into merge-4.5.3-into-4.6.0 2023-08-31 14:45:17 -03:00