 Carlos Bordon
|
39554677bf
|
Merge pull request #1459 from wazuh/merge-4.10.0-into-master
Merge 4.10.0 into master
|
2024-07-19 10:39:37 -03:00 |
|
|
David Correa Rodríguez
|
1a1bc2d72b
|
Merge branch 'master' into merge-4.10.0-into-master
|
2024-07-19 15:38:49 +02:00 |
|
|
Carlos Bordon
|
34bd04e5fc
|
Merge pull request #1462 from wazuh/revert-1451-maintenance/1445-revert-merge-4.9.0-into-master
Revert "Revert merges of 4.9.0 branch into master branch"
|
2024-07-19 10:35:23 -03:00 |
|
|
Carlos Bordon
|
54b2d4ce33
|
Revert "Revert merges of 4.9.0 branch into master branch"
|
2024-07-19 10:34:13 -03:00 |
|
|
David Correa Rodríguez
|
096f0abb32
|
Merge branch '4.10.0' into merge-4.10.0-into-master
|
2024-07-19 13:19:41 +02:00 |
|
|
David Correa Rodríguez
|
701fdc33bb
|
Merge pull request #1458 from wazuh/merge-4.9.0-into-4.10.0
Merge 4.9.0 into 4.10.0
|
2024-07-19 12:39:18 +02:00 |
|
|
David Correa Rodríguez
|
719d4c2b05
|
Merge branch '4.9.0' into merge-4.9.0-into-4.10.0
|
2024-07-19 11:32:51 +02:00 |
|
|
David Correa Rodríguez
|
8a1e5043c6
|
Merge pull request #1451 from wazuh/maintenance/1445-revert-merge-4.9.0-into-master
Revert merges of 4.9.0 branch into master branch
|
2024-07-19 11:18:39 +02:00 |
|
|
David Correa Rodríguez
|
78cb2fc571
|
Merge pull request #1456 from wazuh/maintenance/1452-revert-image-tag
Reverted image tag for 4.9.0 Alpha3
|
2024-07-19 10:35:43 +02:00 |
|
|
David Correa Rodríguez
|
6f49d17696
|
Reverted image tag for 4.9.0 Alpha3
|
2024-07-19 10:33:09 +02:00 |
|
|
David Correa Rodríguez
|
f0c56d6da2
|
Merge pull request #1455 from wazuh/maintenance/1452-change-image-tag
Changed image tag for 4.9.0 Alpha3
|
2024-07-19 10:28:26 +02:00 |
|
|
David Correa Rodríguez
|
e86fbd6791
|
Changed image tag for 4.9.0 Alpha3
|
2024-07-19 10:24:57 +02:00 |
|
|
David Correa Rodríguez
|
3e120aee77
|
Merge pull request #1454 from wazuh/maintenance/1452-bump-revision
Bumped revision for 4.9.0 Alpha3
|
2024-07-19 10:22:40 +02:00 |
|
|
David Correa Rodríguez
|
e10fd22fcc
|
Bumped revision for 4.9.0 Alpha3
|
2024-07-19 10:19:37 +02:00 |
|
|
David Correa Rodríguez
|
eded59bc25
|
Revert "Merge branch '4.9.0' into merge-4.9.0-into-master"
This reverts commit 4923750ea4, reversing
changes made to e1d70c35fe.
|
2024-07-19 09:27:46 +02:00 |
|
|
David Correa Rodríguez
|
0110e696d0
|
Revert "Merge branch '4.9.0' into merge-4.9.0-into-master"
This reverts commit 622c67d2cc, reversing
changes made to 55f209e57f.
|
2024-07-19 09:27:32 +02:00 |
|
|
Carlos Bordon
|
6e30c077d6
|
Merge pull request #1450 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
|
2024-07-18 10:35:54 -03:00 |
|
|
David Correa Rodríguez
|
622c67d2cc
|
Merge branch '4.9.0' into merge-4.9.0-into-master
|
2024-07-18 15:33:47 +02:00 |
|
|
Carlos Bordon
|
4c3a6696f6
|
Merge pull request #1449 from wazuh/merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
|
2024-07-18 10:31:53 -03:00 |
|
|
David Correa Rodríguez
|
5ed2095854
|
Merge branch '4.8.1' into merge-4.8.1-into-4.9.0
|
2024-07-18 15:30:25 +02:00 |
|
|
Carlos Bordon
|
f3474a392e
|
Merge pull request #1448 from wazuh/change/1445-update-readme
Updated files of README.MD
v4.8.1
|
2024-07-18 10:28:57 -03:00 |
|
|
David Correa Rodríguez
|
62fc011c2c
|
Updated files of README.MD
|
2024-07-18 15:26:39 +02:00 |
|
|
David Correa Rodríguez
|
55f209e57f
|
Merge pull request #1447 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
|
2024-07-18 15:03:02 +02:00 |
|
|
David Correa Rodríguez
|
4923750ea4
|
Merge branch '4.9.0' into merge-4.9.0-into-master
|
2024-07-18 14:48:50 +02:00 |
|
|
Carlos Bordon
|
bdce114251
|
Merge pull request #1446 from wazuh/merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
|
2024-07-18 09:37:07 -03:00 |
|
|
David Correa Rodríguez
|
0a440c0433
|
Removed whitespaces
|
2024-07-18 14:34:12 +02:00 |
|
|
David Correa Rodríguez
|
311ffc72d8
|
Merge branch '4.8.1' into merge-4.8.1-into-4.9.0
|
2024-07-18 14:28:33 +02:00 |
|
|
David Correa Rodríguez
|
65fe95472b
|
Merge pull request #1442 from wazuh/enhancement/1439-revert-image-tag
Reverted image tag for 4.8.1 RC4
|
2024-07-17 12:24:57 +02:00 |
|
|
David Correa Rodríguez
|
21e1943cab
|
Reverted image tag for 4.8.1 RC4
|
2024-07-17 12:22:15 +02:00 |
|
|
David Correa Rodríguez
|
4a2d9b54d3
|
Merge pull request #1441 from wazuh/enhancement/1439-change-image-tag
Changed image tag for 4.8.1-RC4
|
2024-07-17 12:17:44 +02:00 |
|
|
David Correa Rodríguez
|
3f320be95d
|
Changed image tag for 4.8.1-RC4
|
2024-07-17 12:13:52 +02:00 |
|
|
David Correa Rodríguez
|
5712d37a7a
|
Merge pull request #1440 from wazuh/enhancement/1439-bump-revision
Bumped revision for 4.8.1 RC4
|
2024-07-17 12:09:30 +02:00 |
|
|
David Correa Rodríguez
|
5d5cc9d30a
|
Bumped revision for 4.8.1 RC4
|
2024-07-17 12:06:16 +02:00 |
|
|
David Correa Rodríguez
|
956d42e932
|
Merge pull request #1436 from wazuh/enhancement/1433-revert-image-tag
Reverted image tag for 4.8.1 RC3
|
2024-07-15 11:32:13 +02:00 |
|
|
David Correa Rodríguez
|
1e70aad5f8
|
Reverted image tag for 4.8.1 RC3
|
2024-07-15 11:30:08 +02:00 |
|
|
David Correa Rodríguez
|
09841ba9e4
|
Merge pull request #1435 from wazuh/enhancement/1433-chage-image-tag
Changed image tag for 4.8.1 RC3
|
2024-07-15 11:26:33 +02:00 |
|
|
David Correa Rodríguez
|
c014ea77f4
|
Changed image tag for 4.8.1 RC3
|
2024-07-15 11:23:03 +02:00 |
|
|
David Correa Rodríguez
|
12d8e8f122
|
Merge pull request #1434 from wazuh/enhancement/1433-bump-revision
Bumped revision for 4.8.1 RC3
|
2024-07-15 11:16:11 +02:00 |
|
|
David Correa Rodríguez
|
fe327f10a3
|
Bumped revision for 4.8.1 RC3
|
2024-07-15 11:10:52 +02:00 |
|
|
David Correa Rodríguez
|
5063213d39
|
Merge pull request #1431 from wazuh/enhancement/1430-revert-image-tag
Reverted image tag for `4.9.0-alpha2`
|
2024-07-12 10:25:49 +02:00 |
|
|
David Correa Rodríguez
|
dca7f9382e
|
Reverted image tag for 4.9.0-alpha2
|
2024-07-12 10:22:27 +02:00 |
|
|
David Correa Rodríguez
|
577e533958
|
Merge pull request #1429 from wazuh/enhancement/1427-change-image-tag
Changed image tag for `4.9.0-alpha2`
|
2024-07-12 10:17:42 +02:00 |
|
|
David Correa Rodríguez
|
98930a6708
|
Changed image tag for 4.9.0-alpha2
|
2024-07-12 09:49:35 +02:00 |
|
|
David Correa Rodríguez
|
f08a3cf64d
|
Merge pull request #1428 from wazuh/enhancement/1427-change-revision
Bumped revision for 4.9.0-alpha2
|
2024-07-12 09:46:21 +02:00 |
|
|
David Correa Rodríguez
|
8cf7909bc0
|
Bumped revision for 4.9.0-alpha2
|
2024-07-12 09:40:40 +02:00 |
|
|
Gonzalo Acuña
|
0c57402b94
|
Merge pull request #1426 from wazuh/revert-1419-enhancement/1414-add-new-keystore
Revert "Add new keystore certificate"
|
2024-07-11 14:31:04 -03:00 |
|
|
vcerenu
|
1e261c165e
|
Revert test changes
|
2024-07-11 14:28:12 -03:00 |
|
|
Victor Ereñú
|
b60e875962
|
Revert "Add new keystore certificate"
|
2024-07-11 23:01:18 +10:00 |
|
|
Victor Ereñú
|
693b9d9c23
|
Merge pull request #1424 from wazuh/enhancemment/1418-merge-4.8.1-into-4.9.0
Merge 4.8.1 into 4.9.0
|
2024-07-08 14:47:11 -03:00 |
|
|
vcerenu
|
a275a08cfe
|
Upward merge
|
2024-07-08 11:54:01 -03:00 |
|