Merge 4.2 into master branch #2132
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add 'jq' dependency installation on windows
…ble unrelated modules
…-results Disable fim test invalid unstable results
Disable unused Wazuh Modules for test_max_files_per_second test
…to fix_test_ignore_valid_timeout
Fix test_ignore_valid.py - Add timeout variable
FIM Windows Agent - Fix test_basic_usage
Fix wazuh_timezone_changes config yaml - disable modules
Skip test_windows_audit_interval on windows 10 systems
Disable test_nodiff Folder
FIM Windows Agent - Fix test_checks
FIM Windows Agent - Fix test_ambiguous_confs
FIM Windows Agent - Fix test_fim/test_registry
1873 disable test affected by 1602
FIM Windows Agent: Reliable full yellow local for 4.2.0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR aims to merge
4.2branch intomasterbranch (which supports Wazuh version 4.3.0).We will work on resolving all the merge conflicts for each different module.
The merge includes mostly all the changes committed in
4.2branch regarding FIM Windows integration tests (#1986)