Code

Merge 4.10.2 into 4.11.0#1695

Code

Merged

Enaraque merged 9 commits into4.11.0wazuh/wazuh-docker:4.11.0from merge-4.10.2-into-4.11.0wazuh/wazuh-docker:merge-4.10.2-into-4.11.0Copy head branch name to clipboardJan 17, 2025

+8

Commits

Commits on Jan 10, 2025

• Add exceptions into PERMANENT_DATA script

  vcerenu

  committed
  347187c

  Copy full SHA for 347187c

Commits on Jan 13, 2025

• Merge pull request #1674 from wazuh/bug/1673-add-permanent_data_excps

  Show description for 633c50b
  teddytpc1

  authored
  633c50b

  Copy full SHA for 633c50b

Commits on Jan 15, 2025

• Bump revision for 4.10.1-rc1

  Enaraque

  committed
  845f7e5

  Copy full SHA for 845f7e5

• Merge pull request #1679 from wazuh/enhancement/1678-bump-revision-to-41011

  CarlosALgit

  authored
  5b3f461

  Copy full SHA for 5b3f461

• Change docker image for 4.10.1-rc1

  Enaraque

  committed
  1ee604e

  Copy full SHA for 1ee604e

• Merge pull request #1680 from wazuh/enhancement/1678-change-docker-image

  CarlosALgit

  authored
  69b4169

  Copy full SHA for 69b4169

• Revert docker image for 4.10.1-rc1

  Enaraque

  committed
  c548f3e

  Copy full SHA for c548f3e

• Merge pull request #1681 from wazuh/enhancement/1678-revert-docker-image

  Enaraque

  authored
  a0c1fd8

  Copy full SHA for a0c1fd8

Commits on Jan 17, 2025

• Merge 4.10.2 into 4.11.0

  Enaraque

  committed
  d2bb16a

  Copy full SHA for d2bb16a