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 master #1025

Merged
merged 30 commits into from
May 31, 2024
Merged

Merge 4.9.0 into master #1025

merged 30 commits into from
May 31, 2024

Commits on May 3, 2024

  1. Bump revision

    @Enaraque
    Enaraque committed May 3, 2024
    Configuration menu
    Copy the full SHA
    3f8d00d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #996 from wazuh/bump-revision-4.8.0 

    Bump revision
    @vcerenu
    vcerenu committed May 3, 2024
    Configuration menu
    Copy the full SHA
    f10ccf8 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. change deploy manifest and change template test

    @vcerenu
    vcerenu committed May 7, 2024
    Configuration menu
    Copy the full SHA
    60fc1e3 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. add ossec_service_provider value

    @vcerenu
    vcerenu committed May 9, 2024
    Configuration menu
    Copy the full SHA
    06be421 View commit details
    Browse the repository at this point in the history

  2. delete comma

    @vcerenu
    vcerenu committed May 9, 2024
    Configuration menu
    Copy the full SHA
    c710b9d View commit details
    Browse the repository at this point in the history

  3. delete wodle_openscap_content variable

    @vcerenu
    vcerenu committed May 9, 2024
    Configuration menu
    Copy the full SHA
    8ec1ab5 View commit details
    Browse the repository at this point in the history

  4. delete comment

    @vcerenu
    vcerenu committed May 9, 2024
    Configuration menu
    Copy the full SHA
    35ef905 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1000 from wazuh/23321-agent-al2023 

    Service provider for Amazon Linux
    @teddytpc1
    teddytpc1 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    0e6f3e1 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Add bump revision

    @Enaraque
    Enaraque committed May 14, 2024
    Configuration menu
    Copy the full SHA
    97c96c3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1002 from wazuh/bump-revision-480 

    Add bump revision to 4.8.0
    @davidcr01
    davidcr01 committed May 14, 2024
    Configuration menu
    Copy the full SHA
    2e7f368 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. bump 4.7.5 version

    @CarlosALgit
    CarlosALgit committed May 15, 2024
    Configuration menu
    Copy the full SHA
    852ae46 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1005 from wazuh/bump-4.7.5 

    Bump to 4.7.5
    @teddytpc1
    teddytpc1 committed May 15, 2024
    Configuration menu
    Copy the full SHA
    0812328 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. change deployment manifest build

    @vcerenu
    vcerenu committed May 17, 2024
    Configuration menu
    Copy the full SHA
    d7b293d View commit details
    Browse the repository at this point in the history

  2. change deployment manifest build

    @vcerenu
    vcerenu committed May 17, 2024
    Configuration menu
    Copy the full SHA
    dbbf505 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Merge pull request #998 from wazuh/931-change-manifest-test 

    Fix Github Actions Tests
    @teddytpc1
    teddytpc1 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    0f6eb69 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

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

    @c-bordon
    c-bordon committed May 22, 2024
    Configuration menu
    Copy the full SHA
    7088846 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1009 from wazuh/merge-4.7.5-into-4.8.0 

    Merge 4.7.5 into 4.8.0
    @teddytpc1
    teddytpc1 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    5a3d962 View commit details
    Browse the repository at this point in the history

  3. Bump revision

    @teddytpc1
    teddytpc1 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    ee88d15 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1010 from wazuh/1007-bump-revision 

    Bump revision
    @c-bordon
    c-bordon committed May 22, 2024
    Configuration menu
    Copy the full SHA
    59a3d25 View commit details
    Browse the repository at this point in the history

  5. Merge branch '4.8.0' into merge-4.7.5-into-4.8.0

    @teddytpc1
    teddytpc1 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    73ff857 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1011 from wazuh/merge-4.7.5-into-4.8.0 

    Merge 4.7.5 into 4.8.0
    @c-bordon
    c-bordon committed May 22, 2024
    Configuration menu
    Copy the full SHA
    14b500b View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Bump 4.8.0 revision

    @Enaraque
    Enaraque committed May 24, 2024
    Configuration menu
    Copy the full SHA
    608932d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1013 from wazuh/1012-bump-revision

    @davidcr01
    davidcr01 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    d874123 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. bump revision

    @vcerenu
    vcerenu committed May 29, 2024
    Configuration menu
    Copy the full SHA
    f845019 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1017 from wazuh/1016-bump-revision 

    Bump revision rc2
    @c-bordon
    c-bordon committed May 29, 2024
    Configuration menu
    Copy the full SHA
    4dde522 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. merge 4.7.5 into 4.8.0

    @vcerenu
    vcerenu committed May 31, 2024
    Configuration menu
    Copy the full SHA
    7db85de View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1023 from wazuh/merge-4.7.5-into-4.8.0 

    Merge 4.7.5 into 4.8.0
    @teddytpc1
    teddytpc1 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    ee12092 View commit details
    Browse the repository at this point in the history

  3. merge 4.8.0 into 4.9.0

    @vcerenu
    vcerenu committed May 31, 2024
    Configuration menu
    Copy the full SHA
    8784207 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1024 from wazuh/1022-merge-4.8.0-into-4.9.0 

    Merge 4.8.0 into 4.9.0
    @teddytpc1
    teddytpc1 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    a3fe6e4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:wazuh/wazuh-puppet into 4.9.0

    @vcerenu
    vcerenu committed May 31, 2024
    Configuration menu
    Copy the full SHA
    e267021 View commit details
    Browse the repository at this point in the history