Code

Merge 4.11.0 into 4.12.0#1672

Code

Merged

CarlosALgit merged 27 commits into4.12.0wazuh/wazuh-docker:4.12.0from merge-4.11.0-into-4.12.0wazuh/wazuh-docker:merge-4.11.0-into-4.12.0Copy head branch name to clipboardJan 10, 2025

+264-26

Commits

Commits on Dec 13, 2024

• Change version for artifact manager actions

  vcerenu

  committed
  77e5484

  Copy full SHA for 77e5484

Commits on Dec 16, 2024

• Merge pull request #1641 from wazuh/change/1640.artifact-actions-version

  Show description for 7cfda05
  teddytpc1

  authored
  7cfda05

  Copy full SHA for 7cfda05

Commits on Dec 18, 2024

• Bump revision for 4.10.0-rc2

  Enaraque

  committed
  2c67046

  Copy full SHA for 2c67046

• Merge pull request #1647 from wazuh/enhancement/1646-bump-revision-to-41007

  CarlosALgit

  authored
  f3b4631

  Copy full SHA for f3b4631

• Change docker image for 4.10.0-rc2

  Enaraque

  committed
  da64bb4

  Copy full SHA for da64bb4

• Merge pull request #1648 from wazuh/enhancement/1646-change-docker-image

  CarlosALgit

  authored
  8468687

  Copy full SHA for 8468687

• Revert docker image for 4.10.0-rc2

  Enaraque

  committed
  8a925f0

  Copy full SHA for 8a925f0

• Merge pull request #1649 from wazuh/enhancement/1646-revert-docker-image

  CarlosALgit

  authored
  7b03b99

  Copy full SHA for 7b03b99

Commits on Dec 20, 2024

• Bump 4.10.1 version

  vcerenu

  committed
  2c2388c

  Copy full SHA for 2c2388c

• Merge pull request #1659 from wazuh/enhancement/1658-bump-4.10.1-version

  Show description for 1f7eae1
  teddytpc1

  authored
  1f7eae1

  Copy full SHA for 1f7eae1

• Bump 4.11.0 version

  vcerenu

  committed
  66a1533

  Copy full SHA for 66a1533

• Merge pull request #1660 from wazuh/enhancement/1656-bump-4.11.0-version

  Show description for 2060e21
  teddytpc1

  authored
  2060e21

  Copy full SHA for 2060e21

Commits on Dec 23, 2024

• Change the cleaning disk step

  vcerenu

  committed
  9e6defa

  Copy full SHA for 9e6defa

• Add changelog

  vcerenu

  committed
  23848dc

  Copy full SHA for 23848dc

• Merge pull request #1663 from wazuh/bug/1642-free-disk-step

  Show description for 90f1d44
  teddytpc1

  authored
  90f1d44

  Copy full SHA for 90f1d44

Commits on Jan 8, 2025

• Bump revision for 4.10.0-rc3

  Enaraque

  committed
  0106421

  Copy full SHA for 0106421

• Merge pull request #1665 from wazuh/enhancement/1664-bump-revision-41008

  CarlosALgit

  authored
  e17302f

  Copy full SHA for e17302f

• Change docker image for 4.10.0-rc3

  Enaraque

  committed
  fc89687

  Copy full SHA for fc89687

• Merge pull request #1666 from wazuh/enhancement/1664-change-docker-image

  CarlosALgit

  authored
  26e9410

  Copy full SHA for 26e9410

• Change docker image for 4.10.0-rc3

  Enaraque

  committed
  98675f0

  Copy full SHA for 98675f0

• Merge pull request #1667 from wazuh/enhancement/1664-revert-docker-image

  CarlosALgit

  authored
  2f3f00f

  Copy full SHA for 2f3f00f

Commits on Jan 10, 2025

• Merge 4.10.0 into 4.10.1

  Enaraque

  committed
  f2a5901

  Copy full SHA for f2a5901

• Merge pull request #1670 from wazuh/merge-4.10.0-into-4.10.1

  CarlosALgit

  authored
  7b415dc

  Copy full SHA for 7b415dc

• Merge 4.10.1 into 4.11.0

  Enaraque

  committed
  79ead0c

  Copy full SHA for 79ead0c

• Merge pull request #1671 from wazuh/merge-4.10.1-into-4.11.0

  Enaraque

  authored
  a7cc8ef

  Copy full SHA for a7cc8ef

• Merge 4.11.0 into 4.12.0

  Enaraque

  committed
  081436b

  Copy full SHA for 081436b

• Update 4.11.0 version to 4.12.0

  Enaraque

  committed
  77ef56a

  Copy full SHA for 77ef56a