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.8.1 into 4.8.2 #948

Merged
merged 15 commits into from
Mar 1, 2024
Merged

Merge 4.8.1 into 4.8.2 #948

merged 15 commits into from
Mar 1, 2024

Commits on Feb 19, 2024

  1. Bump to 4.7.3

    @teddytpc1
    teddytpc1 committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    3181d3f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #927 from wazuh/925-bump-4.7.3 

    Bump to 4.7.3
    @teddytpc1
    teddytpc1 authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    73821e6 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. rollback ism

    @vcerenu
    vcerenu committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    00e0d21 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #931 from wazuh/928-ism-rollback 

    Rollback ISM changes
    @teddytpc1
    teddytpc1 authored Feb 22, 2024
    Configuration menu
    Copy the full SHA
    bd64cad View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Merge branch '4.7.3' into merge-4.7.3-into-4.8.0

    @davidcr01
    davidcr01 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    76ea606 View commit details
    Browse the repository at this point in the history

  2. Added blank line in CHANGELOG.md

    @davidcr01
    davidcr01 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    fe49124 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #933 from wazuh/merge-4.7.3-into-4.8.0 

    Merge 4.7.3 into 4.8.0
    @davidcr01
    davidcr01 authored Feb 23, 2024
    Configuration menu
    Copy the full SHA
    ebcb347 View commit details
    Browse the repository at this point in the history

  4. Bump revision to 40804

    @davidcr01
    davidcr01 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    a3a73f4 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #936 from wazuh/bump-revision 

    Bump revision to 40804
    @teddytpc1
    teddytpc1 authored Feb 23, 2024
    Configuration menu
    Copy the full SHA
    d63a125 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Bump revision to 40713

    @davidcr01
    davidcr01 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    1a17a22 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #942 from wazuh/bump-revision-40713 

    Bump revision to 40713
    @davidcr01
    davidcr01 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    3d9dcff View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. resolving conflicts

    @vcerenu
    vcerenu committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    00f35b9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #944 from wazuh/merge-4.7.3-into-4.8.0 

    Merge 4.7.3 into 4.8.0
    @teddytpc1
    teddytpc1 authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    6bedf76 View commit details
    Browse the repository at this point in the history

  3. resolving conflicts

    @vcerenu
    vcerenu committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    393e718 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #946 from wazuh/merge-4.8.0-into-4.8.1 

    Merge 4.8.0 into 4.8.1
    @teddytpc1
    teddytpc1 authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    ddc8efb View commit details
    Browse the repository at this point in the history