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.10.1 into 4.10.2 #1583

Merged
merged 37 commits into from
Oct 17, 2024
Merged

Merge 4.10.1 into 4.10.2 #1583

merged 37 commits into from
Oct 17, 2024

Commits on Sep 27, 2024

  1. Bump 4.9.1 revision

    @c-bordon
    c-bordon committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    eb4efb3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1548 from wazuh/enhancement/1418-support-new-stag… 

    …e-rc2-for-491

Bump 4.9.1 revision
    @davidcr01
    davidcr01 authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    e292957 View commit details
    Browse the repository at this point in the history

  3. Updated Wazuh images to -rc2 version

    @c-bordon
    c-bordon committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    62ae93e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1549 from wazuh/enhancement/1547-update-docker-im… 

    …age-tag

Updated Wazuh images to -rc2 version
    @davidcr01
    davidcr01 authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    be0ac01 View commit details
    Browse the repository at this point in the history

  5. Revert Wazuh images to -rc2 version

    @c-bordon
    c-bordon committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    0ec38df View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1550 from wazuh/enhancement/1547-revert-docker-im… 

    …age-tag

Revert Wazuh images to 4.9.1 version
    @teddytpc1
    teddytpc1 authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    af023a9 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Update Procedure_push_docker_images.yml

    @YisDav
    YisDav committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    027b260 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Change the dev default value to true for the workflow_dispatch

    @YisDav
    YisDav committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    8bafe12 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1551 from wazuh/enhancement/1864-improve-push-doc… 

    …ker-images-workflow

Improve the push docker images workflow
    @teddytpc1
    teddytpc1 authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    cc20665 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Revert create_user.py script deletion

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

  2. Merge pull request #1555 from wazuh/bug/1554-wazuh-server-container-r… 

    …estarting-in-loop

Revert create_user.py script deletion
    @c-bordon
    c-bordon authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    d237faa View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Bumped revision for 4.9.1-RC3

    @davidcr01
    davidcr01 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    884151b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1559 from wazuh/enhancement/1558-bump-revision 

    Bumped revision for 4.9.1-RC3
    @davidcr01
    davidcr01 authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    97e4dde View commit details
    Browse the repository at this point in the history

  3. Changed image tag for 4.9.1-rc3

    @davidcr01
    davidcr01 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    4177d10 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1560 from wazuh/enhancement/1558-change-image-tag 

    Changed image tag for 4.9.1-rc3
    @davidcr01
    davidcr01 authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    bd7aedc View commit details
    Browse the repository at this point in the history

  5. Reverted image tag for 4.9.1-rc3

    @davidcr01
    davidcr01 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    868c371 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1561 from wazuh/enhancement/1558-revert-image-tag 

    Reverted image tag for 4.9.1-rc3
    @davidcr01
    davidcr01 authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    61b3f5f View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Resolving merge conflicts

    @vcerenu
    vcerenu committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    8695a08 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1568 from wazuh/merge-4.9.1-into-4.10.0 

    Merge 4.9.1 into 4.10.0
    @teddytpc1
    teddytpc1 authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    06a797d View commit details
    Browse the repository at this point in the history

  3. Fix typos

    @vcerenu
    vcerenu committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    1aa1499 View commit details
    Browse the repository at this point in the history

  4. Add changelog

    @vcerenu
    vcerenu committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    f61af29 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1569 from wazuh/bug/1564-fix-typos-entrypoint 

    Fix typos into Wazuh manager entrypoint
    @teddytpc1
    teddytpc1 authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    6074636 View commit details
    Browse the repository at this point in the history

  6. Bump revision

    @YisDav
    YisDav committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    dbb7766 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1571 from wazuh/enhancement/1570-add-support-for-… 

    …alpha-2

Add support for alpha 2
    @c-bordon
    c-bordon authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    50769ef View commit details
    Browse the repository at this point in the history

  8. Update docker-compose versions

    @YisDav
    YisDav committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    db4133d View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1572 from wazuh/enhancement/1570-docker-compose-v… 

    …ersion

Update image tag versions to 4.10.0-alpha2
    @teddytpc1
    teddytpc1 authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    424846a View commit details
    Browse the repository at this point in the history

  10. Revert image tag to 4.10.0

    @YisDav
    YisDav committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    5795fa1 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #1573 from wazuh/enhancement/1570-revert-image-tag 

    Revert image tag to 4.10.0
    @teddytpc1
    teddytpc1 authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    b1f0a1f View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Bump revision

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

  2. change image taf for rc4

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

  3. Revert image tag for rc4

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

Commits on Oct 17, 2024

  1. Resolve conflicts

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

  2. Merge pull request #1581 from wazuh/merge-4.9.1-into-4-10-0 

    Merge 4.9.1 into 4.10.0
    @teddytpc1
    teddytpc1 authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    f4e7d19 View commit details
    Browse the repository at this point in the history

  3. Resolve conflicts

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

  4. Resolve conflicts

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

  5. Merge pull request #1582 from wazuh/merge-4.10.0-into-4.10.1 

    Merge 4.10.0 into 4.10.1
    @teddytpc1
    teddytpc1 authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    ea0e679 View commit details
    Browse the repository at this point in the history

  6. Resolve conflicts

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