Code

Merge 4.7.1 into master#1011

Code

Merged

teddytpc1 merged 16 commits intomasterwazuh/wazuh-docker:masterfrom merge-4.7.1-into-masterwazuh/wazuh-docker:merge-4.7.1-into-masterCopy head branch name to clipboardSep 22, 2023

+17-4

Commits

Commits on Sep 7, 2023

• add extensions for wazuh.yml

  vcerenu

  committed
  63817df

Commits on Sep 8, 2023

• Merge pull request #988 from wazuh/987-add-support-to-define-the-default-value-of-extensionsgithub-and-extensionsoffice-in-the-wazuh-dashboard-docker-image

  Show description for 73ada94
  teddytpc1

  authored
  73ada94

Commits on Sep 12, 2023

• change wazuh template origin

  vcerenu

  committed
  de77543

Commits on Sep 13, 2023

• Merge pull request #992 from wazuh/984-build-imagessh-script-is-not-capable-of-using-repos-majorminorpatch-branches

  Show description for 0c6077c
  teddytpc1

  authored
  0c6077c

Commits on Sep 18, 2023

• change RBAC database procedure

  vcerenu

  committed
  5769159

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

  Show description for 536dd51
  teddytpc1

  authored
  536dd51

• Add Amazon Linux 2023 VDT support

  Leoquicenoz

  committed
  8cc5c8b

Commits on Sep 20, 2023

• Bump version to 4.7.1

  davidcr01

  committed
  d449ae7

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

  Show description for a6c22d9
  teddytpc1

  authored
  a6c22d9

Commits on Sep 21, 2023

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

  Show description for 149df5e
  teddytpc1

  authored
  149df5e

Commits on Sep 22, 2023

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

  davidcr01

  committed
  7312f86

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

  Show description for 6407325
  teddytpc1

  authored
  6407325

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

  davidcr01

  committed
  a3e2a2d

• Updated TEMPLATE_VERSION variable

  davidcr01

  committed
  b3441a6

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

  Show description for a98e57b
  teddytpc1

  authored
  a98e57b

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

  davidcr01

  committed
  d8f7fd6