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.1 into master #1011

Merged
merged 16 commits into from
Sep 22, 2023
Merged

Merge 4.7.1 into master #1011

merged 16 commits into from
Sep 22, 2023

Commits on Sep 7, 2023

  1. add extensions for wazuh.yml

    @vcerenu
    vcerenu committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    63817df View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Merge pull request #988 from wazuh/987-add-support-to-define-the-defa… 

    …ult-value-of-extensionsgithub-and-extensionsoffice-in-the-wazuh-dashboard-docker-image

Add extensions into wazuh.yml
    @teddytpc1
    teddytpc1 authored Sep 8, 2023
    Configuration menu
    Copy the full SHA
    73ada94 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. change wazuh template origin

    @vcerenu
    vcerenu committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    de77543 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. Merge pull request #992 from wazuh/984-build-imagessh-script-is-not-c… 

    …apable-of-using-repos-majorminorpatch-branches

Change wazuh template origin
    @teddytpc1
    teddytpc1 authored Sep 13, 2023
    Configuration menu
    Copy the full SHA
    0c6077c View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. change RBAC database procedure

    @vcerenu
    vcerenu committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    5769159 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1000 from wazuh/18966-error-in-wazuh-docker-startup 

    Error in Wazuh Docker startup
    @teddytpc1
    teddytpc1 authored Sep 18, 2023
    Configuration menu
    Copy the full SHA
    536dd51 View commit details
    Browse the repository at this point in the history

  3. Add Amazon Linux 2023 VDT support

    @Leoquicenoz
    Leoquicenoz committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    8cc5c8b View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Bump version to 4.7.1

    @davidcr01
    davidcr01 committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    d449ae7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1003 from wazuh/bump-version-4.7.1 

    Bump version to 4.7.1
    @teddytpc1
    teddytpc1 authored Sep 20, 2023
    Configuration menu
    Copy the full SHA
    a6c22d9 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Merge pull request #973 from wazuh/17617-vdt-alas2023-support 

    Add Amazon Linux 2023 VDT default configuration
    @teddytpc1
    teddytpc1 authored Sep 21, 2023
    Configuration menu
    Copy the full SHA
    149df5e View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Merge remote-tracking branch 'origin/4.6.0' into merge-4.6.0-into-4.7.0

    @davidcr01
    davidcr01 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    7312f86 View commit details
    Browse the repository at this point in the history

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

    Merge 4.6.0 into 4.7.0
    @teddytpc1
    teddytpc1 authored Sep 22, 2023
    Configuration menu
    Copy the full SHA
    6407325 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/4.7.0' into merge-4.7.0-into-4.7.1

    @davidcr01
    davidcr01 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    a3e2a2d View commit details
    Browse the repository at this point in the history

  4. Updated TEMPLATE_VERSION variable

    @davidcr01
    davidcr01 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    b3441a6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1010 from wazuh/merge-4.7.0-into-4.7.1 

    Merge 4.7.0 into 4.7.1
    @teddytpc1
    teddytpc1 authored Sep 22, 2023
    Configuration menu
    Copy the full SHA
    a98e57b View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/4.7.1' into merge-4.7.1-into-master

    @davidcr01
    davidcr01 committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    d8f7fd6 View commit details
    Browse the repository at this point in the history