Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 4.9.0 into 4.10.0 #1458

Merged
merged 62 commits into from
Jul 19, 2024
Merged

Merge 4.9.0 into 4.10.0 #1458

merged 62 commits into from
Jul 19, 2024

Conversation

davidcr01
Copy link
Contributor

Related #1445

davidcr01 and others added 30 commits June 20, 2024 10:20
@davidcr01
Bumped revision to 40901
2b10eff
@davidcr01
Merge pull request #1399 from wazuh/maintenance/bump-revision-40901
60d6fb8 
Bumped revision to 40901
@davidcr01
Changed image tag for 4.9.0-alpha1
956be62
@davidcr01
Merge pull request #1400 from wazuh/maintenance/1398-change-tag
78006fc 
Changed image tag for 4.9.0-alpha1
@davidcr01
Reverted image tag from 4.9.0-alpha1
f4596dc
@davidcr01
Merge pull request #1401 from wazuh/maintenance/1398-revert-tag
faddbe4 
Reverted image tag from 4.9.0-alpha1
@vcerenu
Modify Wazuh indexer and dashboard Dockerfles
24f12a7
@vcerenu
change version for goss
ed9b2f0
@teddytpc1
Merge pull request #1405 from wazuh/enhancement/6639-docker-images-build
e9ed0d1 
Modify Wazuh indexer and dashboard Dockerfles
@davidcr01
Bumped REVISION to 40814
3112eb2
@davidcr01
Merge pull request #1411 from wazuh/enhancement/1410-support-4.8.1-rc…
bdd919f 
…1-stage

Bumped REVISION to 40814
@davidcr01
Changed image tag for 4.8.1 RC1
7257ddc
@davidcr01
Merge pull request #1412 from wazuh/enhancement/1410-change-image-tag
6b62f1c 
Changed image tag for 4.8.1 RC1
@davidcr01
Reverted image tag for 4.8.1 RC1
91513bd
@davidcr01
Merge pull request #1413 from wazuh/enhancement/1410-revert-image-tag
8cb7da8 
Reverted image tag for 4.8.1 RC1
@vcerenu
Add new keystore generation
2487a54
@vcerenu
Fix goss test
665f6fd
@vcerenu
Fix wazuh documents tests
6138516
@teddytpc1
Merge pull request #1419 from wazuh/enhancement/1414-add-new-keystore
a67c407 
Add new keystore certificate
@vcerenu
Bump revision number
a583069
@teddytpc1
Merge pull request #1420 from wazuh/enhancement/1417-bump-revision-nu…
ad6a08c 
…mber

Bump revision number
@vcerenu
change image version por rc2
6049aec
@teddytpc1
Merge pull request #1421 from wazuh/enhancement/1417-change-image-ver…
c248592 
…sion

Change image version por rc2
@vcerenu
Rollback image version
0682eff
@teddytpc1
Merge pull request #1422 from wazuh/enhancement/1417-rollback-image-v…
2709a8e 
…ersion

Rollback image version
@vcerenu
Upward merge
a275a08
@vcerenu
Merge pull request #1424 from wazuh/enhancemment/1418-merge-4.8.1-int…
693b9d9 
…o-4.9.0

Merge 4.8.1 into 4.9.0
@vcerenu
Revert "Add new keystore certificate"
b60e875
@vcerenu
Revert test changes
1e261c1
@teddytpc1
Merge pull request #1426 from wazuh/revert-1419-enhancement/1414-add-…
0c57402 
…new-keystore

Revert "Add new keystore certificate"
davidcr01 and others added 24 commits July 15, 2024 11:23
@davidcr01
Changed image tag for 4.8.1 RC3
c014ea7
@davidcr01
Merge pull request #1435 from wazuh/enhancement/1433-chage-image-tag
09841ba 
Changed image tag for 4.8.1 RC3
@davidcr01
Reverted image tag for 4.8.1 RC3
1e70aad
@davidcr01
Merge pull request #1436 from wazuh/enhancement/1433-revert-image-tag
956d42e 
Reverted image tag for 4.8.1 RC3
@davidcr01
Bumped revision for 4.8.1 RC4
5d5cc9d
@davidcr01
Merge pull request #1440 from wazuh/enhancement/1439-bump-revision
5712d37 
Bumped revision for 4.8.1 RC4
@davidcr01
Changed image tag for 4.8.1-RC4
3f320be
@davidcr01
Merge pull request #1441 from wazuh/enhancement/1439-change-image-tag
4a2d9b5 
Changed image tag for 4.8.1-RC4
@davidcr01
Reverted image tag for 4.8.1 RC4
21e1943
@davidcr01
Merge pull request #1442 from wazuh/enhancement/1439-revert-image-tag
65fe954 
Reverted image tag for 4.8.1 RC4
@davidcr01
Merge branch '4.8.1' into merge-4.8.1-into-4.9.0
311ffc7
@davidcr01
Removed whitespaces
0a440c0
@c-bordon
Merge pull request #1446 from wazuh/merge-4.8.1-into-4.9.0
bdce114 
Merge 4.8.1 into 4.9.0
@davidcr01
Updated files of README.MD
62fc011
@c-bordon
Merge pull request #1448 from wazuh/change/1445-update-readme
f3474a3 
Updated files of README.MD
@davidcr01
Merge branch '4.8.1' into merge-4.8.1-into-4.9.0
5ed2095
@c-bordon
Merge pull request #1449 from wazuh/merge-4.8.1-into-4.9.0
4c3a669 
Merge 4.8.1 into 4.9.0
@davidcr01
Bumped revision for 4.9.0 Alpha3
e10fd22
@davidcr01
Merge pull request #1454 from wazuh/maintenance/1452-bump-revision
3e120ae 
Bumped revision for 4.9.0 Alpha3
@davidcr01
Changed image tag for 4.9.0 Alpha3
e86fbd6
@davidcr01
Merge pull request #1455 from wazuh/maintenance/1452-change-image-tag
f0c56d6 
Changed image tag for 4.9.0 Alpha3
@davidcr01
Reverted image tag for 4.9.0 Alpha3
6f49d17
@davidcr01
Merge pull request #1456 from wazuh/maintenance/1452-revert-image-tag
78cb2fc 
Reverted image tag for 4.9.0 Alpha3
@davidcr01
Merge branch '4.9.0' into merge-4.9.0-into-4.10.0
719d4c2
@davidcr01 davidcr01 requested a review from a team July 19, 2024 09:35
@davidcr01 davidcr01 self-assigned this Jul 19, 2024
@davidcr01 davidcr01 merged commit 701fdc3 into 4.10.0 Jul 19, 2024
4 of 5 checks passed
@davidcr01 davidcr01 deleted the merge-4.9.0-into-4.10.0 branch July 19, 2024 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcerenu vcerenu vcerenu approved these changes

@Enaraque Enaraque Enaraque approved these changes

Assignees

@davidcr01 davidcr01

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@davidcr01 @vcerenu @Enaraque @teddytpc1 @c-bordon