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.5.2 into 4.6.0 #4418

Merged
merged 30 commits into from
Aug 11, 2023
Merged

Merge 4.5.2 into 4.6.0 #4418

merged 30 commits into from
Aug 11, 2023

Conversation

Rebits
Copy link
Member

@Rebits Rebits commented Aug 11, 2023

Related issue
#4414

Description

Merge 4.5.2 into 4.6.0

vikman90 and others added 29 commits July 6, 2023 12:43
@vikman90
feat(#4281): New invalid decoder test case for wazuh-logtest
bb56c93
@vikman90
fix(#4281): Fix invalid_decoder_syntax.yaml file line lengths
145d456
@vikman90
Merge pull request #4286 from wazuh/4281-add-analysisd-decoder-test
989f966 
Add an integration test to check the wazuh-analysisd's decoder parser
@jnasselle
feat(#4325): upgrade pyyaml to 6.0.1
c31208d
@juliamagan
feat: bump version 4.5.2
cb06e6b
@juliamagan
Merge pull request #4329 from wazuh/bump-version-4.5.2
b908d39 
Bump version to 4.5.2
@davidjiglesias
Merge pull request #4326 from wazuh/fix/4325-upgrade-pyyaml-to-6.0.1
2ad0ac5 
Upgrade PyYAML to 6.0.1
@lsayanes @MarcelKemp
fix(#4275): modified year field in test_update_from_year
0344a58
@Leoquicenoz @MarcelKemp
fix(#4275): update custom feeds to NVD 2.0 structure
912c80e
@MarcelKemp
fix(#4275): deprecate NVD update_from_year option and related changes
0eda4d6
@MarcelKemp
fix(#4275): NVD feed must be in one line
ca2ba0e
@MarcelKemp
fix(#4275): more NVD feed one line fix
29fb4ce
@MarcelKemp
style(#4275): fix quoted errors in YAML file
918ac65
@MarcelKemp
style(#4275): added changelog entry and fixed indexing problems
7811dd6
@Rebits
Merge branch '4.5.0' into merge-4.5.0-into-4.5.1
71ae8d9
@Rebits
Merge pull request #4345 from wazuh/merge-4.5.0-into-4.5.1
703efb7 
Merge 4.5.0 into 4.5.1
@Rebits
Merge remote-tracking branch 'origin/4.5.1' into merge-4.5.1-into-4.5.2
5e75f03
@Rebits
Merge pull request #4347 from wazuh/merge-4.5.1-into-4.5.2
74d158e 
Merge 4.5.1 into 4.5.2
@Dwordcito
Merge pull request #4327 from wazuh/4275-NVD-2.0-ITs
ede149c 
NVD 2.0 Integration Test
@juliamagan
fix: delete update_from_year for nvd
358b15c
@davidjiglesias
Merge pull request #4372 from wazuh/enhancement/4302-deprecate-update…
9da6f68 
…-from-year

Delete `update_from_year` from system and E2E tests
@juliamagan
docs: update changelog
15930f6
@juliamagan
Merge pull request #4397 from wazuh/enhancement/4396-update-changelog
dc5ba5a 
Update 4.5.0 changelog
@juliamagan
docs: update changelog
e124b36
@juliamagan
Merge pull request #4398 from wazuh/enhancement/4395-update-changelog
b51f4ad 
Update 4.5.1 changelog
@BelenValdivia
Merge branch 4.5 into 4.5.1
c2f9ac1
@Rebits
Merge pull request #4416 from wazuh/merge-4.5-into-4.5.1
395fd7c 
Merge 4.5 into 4.5.1
@Rebits
merge: branch '4.5.1' into merge-4.5.1-into-4.5.2
0b0cd22
@havidarou
Merge pull request #4417 from wazuh/merge-4.5.1-into-4.5.2
0726ece 
Merge 4.5.1 into 4.5.2
@Rebits Rebits linked an issue Aug 11, 2023 that may be closed by this pull request
Maintain production and numbered branches post release v4.5.0 #4414
Closed
7 tasks
@Rebits Rebits mentioned this pull request Aug 11, 2023
Closed
7 tasks
@Rebits Rebits force-pushed the merge-4.5.2-into-4.6.0 branch from c3a9cab to 7c9d30a Compare August 11, 2023 10:16
@Rebits Rebits merged commit 2f8ef8c into 4.6.0 Aug 11, 2023
@Rebits Rebits deleted the merge-4.5.2-into-4.6.0 branch August 11, 2023 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@damarisg damarisg damarisg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Maintain production and numbered branches post release v4.5.0