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.

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

Merge v4.3.6 into master #822

Merged
merged 34 commits into from
Jul 25, 2022
Merged

Merge v4.3.6 into master #822

merged 34 commits into from
Jul 25, 2022

Conversation

teddytpc1
Copy link
Member

This PR merges v.4.3.6 into master.

teddytpc1 and others added 30 commits May 12, 2022 14:37
Ignore time option removed from VD config
Fix to be able to set complex passwords with symbols too
Wazuh agent and manager version updated
Copy link
Member

@vcerenu vcerenu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@okynos okynos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor fix

Comment on lines 3 to 7
<<<<<<< HEAD
dashboard_version: 4.3.6
=======
dashboard_version: 4.5.0
>>>>>>> master
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Thanks.

@teddytpc1 teddytpc1 requested review from okynos and vcerenu July 25, 2022 11:08
@okynos okynos merged commit 68718a0 into master Jul 25, 2022
@okynos okynos deleted the merge-436-master branch July 25, 2022 11:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants