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.7.0 into master #2312

Merged
merged 15 commits into from
Jul 25, 2023
Merged

Merge 4.7.0 into master #2312

merged 15 commits into from
Jul 25, 2023

Commits on Jul 13, 2023

  1. Bump reference to 4.5.0 version

    @wazuhci @DFolchA
    wazuhci authored and DFolchA committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    c63aa69 View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.5.0' of https://github.com/wazuh/wazuh-packages into … 

    …add-4.4.5-to-4.5.0
    @DFolchA
    DFolchA committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    5a9f041 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2269 from wazuh/add-4.4.5-to-4.5.0 

    Add missing 4.4.5 version to 4.5.0 branch
    @vikman90
    vikman90 authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    a7a66ab View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Update version to 4.5.2

    @DFolchA
    DFolchA committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    3511e14 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2296 from wazuh/bump-version-4.5.2 

    Update version to 4.5.2
    @vikman90
    vikman90 authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    04fa506 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Merge branch '4.5.0' into merge-4.5.0-into-4.5.1

    @Dwordcito
    Dwordcito committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    d426722 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2307 from wazuh/merge-4.5.0-into-4.5.1 

    Merge 4.5.0 into 4.5.1
    @TomasTurina
    TomasTurina authored Jul 21, 2023
    Configuration menu
    Copy the full SHA
    74faa83 View commit details
    Browse the repository at this point in the history

  3. Merge branch '4.5.1' into merge-4.5.1-into-4.5.2

    @Dwordcito
    Dwordcito committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    d64af33 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2308 from wazuh/merge-4.5.1-into-4.5.2 

    Merge 4.5.1 into 4.5.2
    @Dwordcito
    Dwordcito authored Jul 21, 2023
    Configuration menu
    Copy the full SHA
    78c8cd4 View commit details
    Browse the repository at this point in the history

  5. Merge branch '4.5.2' into merge-4.5.2-into-4.6.0

    @Dwordcito
    Dwordcito committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    1f3d25d View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2023

  1. Merge pull request #2309 from wazuh/merge-4.5.2-into-4.6.0 

    Merge 4.5.2 into 4.6.0
    @Dwordcito
    Dwordcito authored Jul 22, 2023
    Configuration menu
    Copy the full SHA
    64aa0b2 View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.6.0' into merge-4.6.0-into-4.7.0

    @Dwordcito
    Dwordcito committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    fa67645 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. Update version in GH action

    @DFolchA
    DFolchA committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    73e6f56 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2310 from wazuh/merge-4.6.0-into-4.7.0 

    Merge 4.6.0 into 4.7.0
    @vikman90
    vikman90 authored Jul 24, 2023
    Configuration menu
    Copy the full SHA
    7b67493 View commit details
    Browse the repository at this point in the history

  3. Merge branch '4.7.0' into merge-4.7.0-into-master

    @vikman90
    vikman90 committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    de33315 View commit details
    Browse the repository at this point in the history