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 #1375

Merged
merged 43 commits into from
May 31, 2024
Merged

Merge 4.9.0 into master #1375

merged 43 commits into from
May 31, 2024

Commits on May 3, 2024

  1. bump revision

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

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

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

  3. change image tag for rc1

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

  4. Merge pull request #1332 from wazuh/change-image-tag 

    Change image tag for rc1
    @vcerenu
    vcerenu authored May 3, 2024
    Configuration menu
    Copy the full SHA
    d57ce6b View commit details
    Browse the repository at this point in the history

  5. rollback image tag

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

  6. Merge pull request #1333 from wazuh/rollback-image-tag 

    rollback image tag
    @vcerenu
    vcerenu authored May 3, 2024
    Configuration menu
    Copy the full SHA
    7d2d8fe View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. bump revision number

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

  2. Merge pull request #1340 from wazuh/bump-revision-number 

    Bump revision number
    @davidcr01
    davidcr01 authored May 14, 2024
    Configuration menu
    Copy the full SHA
    5963054 View commit details
    Browse the repository at this point in the history

  3. commit image tag

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

  4. Merge pull request #1341 from wazuh/commit-image-tag 

    Commit image tag to rc2
    @davidcr01
    davidcr01 authored May 14, 2024
    Configuration menu
    Copy the full SHA
    52eae12 View commit details
    Browse the repository at this point in the history

  5. rollback image tag

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

  6. Merge pull request #1342 from wazuh/rollback-image-tag 

    Rollback image tag
    @davidcr01
    davidcr01 authored May 14, 2024
    Configuration menu
    Copy the full SHA
    8242659 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. bump 4.7.5 version

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

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

    Bump 4.7.5 version
    @teddytpc1
    teddytpc1 authored May 15, 2024
    Configuration menu
    Copy the full SHA
    7df0ee2 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. commit image version

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

  2. Merge pull request #1350 from wazuh/1348-commit-image-version 

    Commit rc1 image version
    @teddytpc1
    teddytpc1 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    2bd7c0d View commit details
    Browse the repository at this point in the history

  3. Rollback image version

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

  4. Merge pull request #1351 from wazuh/1348-rollback-image-version 

    Rollback rc1 image version
    @teddytpc1
    teddytpc1 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    2b25f36 View commit details
    Browse the repository at this point in the history

  5. Bump revision

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

  6. Merge pull request #1352 from wazuh/1348-bump-revision 

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

  7. Change docker image tag

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

  8. Merge pull request #1353 from wazuh/1348-change-tag 

    Change docker image tag
    @c-bordon
    c-bordon authored May 22, 2024
    Configuration menu
    Copy the full SHA
    9487dd5 View commit details
    Browse the repository at this point in the history

  9. Revert docker image tag

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

  10. Merge pull request #1354 from wazuh/1348-revert-tag 

    Revert docker image tag
    @c-bordon
    c-bordon authored May 22, 2024
    Configuration menu
    Copy the full SHA
    bac9daa View commit details
    Browse the repository at this point in the history

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

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

  12. Merge pull request #1355 from wazuh/merge-4.7.5-into-4.8.0 

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

Commits on May 24, 2024

  1. bump revision

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

  2. Merge pull request #1358 from wazuh/1357-bump-revision

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

  3. commit image version

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

  4. Merge pull request #1359 from wazuh/1357-commit-image-version

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

  5. rollback image version

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

  6. Merge pull request #1360 from wazuh/1357-rollback-image-version 

    Rollback image version rc3
    @davidcr01
    davidcr01 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    cfa0a22 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
    c6b38e3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1364 from wazuh/1363-bump-revision 

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

  3. commit image version

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

  4. Merge pull request #1365 from wazuh/1363-commit-image-version 

    Commit image version rc2
    @c-bordon
    c-bordon authored May 29, 2024
    Configuration menu
    Copy the full SHA
    f048880 View commit details
    Browse the repository at this point in the history

  5. rollback image version

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

  6. Merge pull request #1366 from wazuh/1363-rollback-image-version 

    Rollback image version rc2
    @c-bordon
    c-bordon authored May 29, 2024
    Configuration menu
    Copy the full SHA
    e601878 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
    f63c34d View commit details
    Browse the repository at this point in the history

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

    Merge 4.7.5 into 4.8.0
    @teddytpc1
    teddytpc1 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    53d1ad8 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
    d59ee1b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1374 from wazuh/1371-merge-4.8.0-into-4.9.0 

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

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

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