Commit Graph

2583 Commits

Author SHA1 Message Date
Carlos Bordon
65d6fc55b3
Merge pull request #1296 from wazuh/merge-4.7.5-into-4.8.0
Merge 4.7.5 into 4.8.0
2024-05-22 15:01:56 -03:00
Gonzalo Acuña
84fba33abf
Merge branch '4.8.0' into merge-4.7.5-into-4.8.0 2024-05-22 15:00:18 -03:00
Carlos Bordon
1c8524add8
Merge pull request #1295 from wazuh/1292-bump-revision
Bump revision
2024-05-22 14:05:00 -03:00
Gonzalo Acuña
0d622cc8de
Bump revision 2024-05-22 13:53:24 -03:00
Gonzalo Acuña
5dce7484d5
Merge pull request #1294 from wazuh/merge-4.7.5-into-4.8.0
Merge 4.7.5 into 4.8.0
2024-05-22 12:08:33 -03:00
Carlos Bordon
fdaaf5a1ca
Update main.yml 2024-05-22 12:08:06 -03:00
Carlos Bordon
5720250826
Merge branch '4.8.0' into merge-4.7.5-into-4.8.0 2024-05-22 12:05:45 -03:00
Gonzalo Acuña
3d6c66777f
Merge pull request #1290 from wazuh/1282-change-wazuh-api-user
Change wazuh api username
2024-05-22 08:58:06 -03:00
vcerenu
caaac9ffe1
revert old yamls 2024-05-22 04:59:44 -03:00
David Correa Rodríguez
02b72932eb
Fixed apt_key deprecation 2024-05-21 17:38:02 +02:00
vcerenu
f2e3248cf5
change wazuh api username 2024-05-21 07:24:49 -03:00
Gonzalo Acuña
1e9ca3db09
Merge pull request #1288 from wazuh/bump-version-4.7.5
Bump 4.7.5 version
2024-05-15 07:29:00 -03:00
Enrique Araque
e4c61578b3
Bump 4.7.5 version 2024-05-15 12:15:04 +02:00
David Correa Rodríguez
9c50ae029a
Merge pull request #1284 from wazuh/bump-revision-480 2024-05-14 10:45:57 +02:00
Carlos Anguita López
8d98aa72f5
add bump revision 2024-05-14 10:39:29 +02:00
Gonzalo Acuña
59ce0d5a97
Merge pull request #1281 from wazuh/1134-index-tag
Manager index-status tag update
2024-05-08 11:21:13 -03:00
Gonzalo Acuña
15c90501e8
Manager index-status tag update 2024-05-08 09:37:09 -03:00
Victor Ereñú
2252e99259
Merge pull request #1280 from wazuh/bump-revision-480
Bump revision
2024-05-03 05:11:50 -03:00
Carlos Anguita López
dd3c2f8181
bump revision 2024-05-03 10:07:11 +02:00
Gonzalo Acuña
ba756877dc
Merge pull request #1277 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-04-30 10:08:32 -03:00
Gonzalo Acuña
fe2c530a15
Merge pull request #1276 from wazuh/merge-4.8.0-into-4.9.0
Merge 4.8.0 into 4.9.0
2024-04-30 10:06:01 -03:00
Gonzalo Acuña
e028250f12
Merge branch '4.9.0' into merge-4.8.0-into-4.9.0 2024-04-30 10:05:04 -03:00
Gonzalo Acuña
b0cd35cf73
Merge pull request #1275 from wazuh/merge-4.7.4-into-4.8.0
Merge 4.7.4 into 4.8.0
2024-04-30 09:31:07 -03:00
Carlos Anguita López
96987e35b1
merge 4.7.4 into 4.8.0 2024-04-30 14:13:49 +02:00
Victor Ereñú
7c8ee86eed
Merge pull request #1272 from wazuh/bump-revision-474
Bump revision 40717
2024-04-25 05:07:31 -03:00
vcerenu
42dfaadcf9
bump revision 2024-04-25 04:57:00 -03:00
David Correa Rodríguez
bd507ec297
Merge pull request #1270 from wazuh/bump-revision-40716
Bumped revision to 40716
2024-04-23 09:24:58 +02:00
David Correa Rodríguez
fbc79692d3
Bumped revision to 40716 2024-04-23 09:20:23 +02:00
David Correa Rodríguez
ed2759eb60
Merge pull request #1268 from wazuh/bump-revision-40808
Bumped revision to 40808
2024-04-19 10:15:35 +02:00
David Correa Rodríguez
022e899d90
Bumped revision to 40808 2024-04-19 09:56:27 +02:00
Gonzalo Acuña
0363783191
Merge pull request #1265 from wazuh/bump-version-4.7.4
Bump branch 4.7.4
2024-04-18 10:42:13 -03:00
c-bordon
f19f81fbb9
Bump branch 4.7.4 2024-04-18 10:36:19 -03:00
Gonzalo Acuña
098b14355e
Merge pull request #1257 from wazuh/bug/1254-fix-4x-49-references-master
Fix 4.x and 4.9 references in master branch
2024-04-11 08:21:37 -03:00
Carlos Anguita López
0dc34dc944
changed more references from 4.x to 5.x 2024-04-11 09:51:45 +02:00
Carlos Anguita López
ea1b6f9506
Changed 4.x occurrences to 5.x and 4.9 to 5.0 2024-04-10 13:01:37 +02:00
David Correa Rodríguez
5a187973cd
Merge pull request #1252 from wazuh/bump-revision-40807
Bumped revision to 40807
2024-04-05 12:33:34 +02:00
David Correa Rodríguez
d98be9a073
Bumped revision to 40807 2024-04-05 12:09:39 +02:00
David Correa Rodríguez
054f2ba8f1
Merge pull request #1250 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-04-01 11:31:00 +02:00
David Correa Rodríguez
d89e5705ce
Merge branch '4.9.0' into merge-4.9.0-into-master 2024-04-01 11:11:14 +02:00
David Correa Rodríguez
10f0758f61
Merge pull request #1249 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-04-01 11:05:43 +02:00
David Correa Rodríguez
d1198aa0da
Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-04-01 10:58:25 +02:00
David Correa Rodríguez
8bb64037b5
Merge pull request #1248 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-04-01 10:56:53 +02:00
David Correa Rodríguez
c3a08f97c8
Merge branch '4.8.1' into merge-4.8.1-into-4.8.2 2024-04-01 10:48:42 +02:00
David Correa Rodríguez
42121c3055
Merge pull request #1247 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-04-01 10:47:21 +02:00
David Correa Rodríguez
6f85b7db91
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-04-01 10:03:20 +02:00
Gonzalo Acuña
11e74b1d53
Merge pull request #1244 from wazuh/513-auxiliary-scripts-are-being-permanently-installed-on-wazuh-manager-by-docker-and-ansible-deployments
Delete create_user.py script
2024-03-26 07:37:33 -03:00
vcerenu
ffddd179d8
delete create_user.py script after use 2024-03-25 09:45:01 -03:00
David Correa Rodríguez
50eb82f512
Merge pull request #1242 from wazuh/bump-version-40806
Bumped version to 40806
2024-03-12 11:06:58 +01:00
David Correa Rodríguez
99e83d2a87
Bumped version to 40806 2024-03-12 11:01:41 +01:00
Gonzalo Acuña
4365350fff
Merge pull request #1239 from wazuh/bug/1201-update-permissions-manager
Updated manager permissions files from `640` to `660`
2024-03-06 12:17:48 -03:00