Code

Merge 4.11.0 into 4.12.0#1711

Code

Merged

c-bordon merged 14 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 clipboardFeb 4, 2025

+1-1

Commits

Commits on Jan 17, 2025

• bump 4.10.2 version

  vcerenu

  committed
  34d25df

  Copy full SHA for 34d25df

• Merge pull request #1698 from wazuh/enhancement/1697-bump-4.10.2-version

  Show description for 5fb9a0b
  teddytpc1

  authored
  5fb9a0b

  Copy full SHA for 5fb9a0b

Commits on Jan 24, 2025

• Revision bump

  teddytpc1

  committed
  052bce7

  Copy full SHA for 052bce7

• Merge pull request #1704 from wazuh/enhancement/1703-bump-revision

  Show description for 49fb356
  teddytpc1

  authored
  49fb356

  Copy full SHA for 49fb356

• Image tags changed for alpha1

  teddytpc1

  committed
  2b30318

  Copy full SHA for 2b30318

• Merge pull request #1705 from wazuh/enhancement/1703-image-tags

  Show description for 7325389
  teddytpc1

  authored
  7325389

  Copy full SHA for 7325389

• Revert image tags for alpha1

  teddytpc1

  committed
  2bed6e2

  Copy full SHA for 2bed6e2

• Merge pull request #1706 from wazuh/enhancement/1703-revert-tags

  Show description for b29bd6b
  teddytpc1

  authored
  b29bd6b

  Copy full SHA for b29bd6b

Commits on Feb 4, 2025

• Resolving merge conflicts

  vcerenu

  committed
  e4f782f

  Copy full SHA for e4f782f

• Resolving merge conflicts

  vcerenu

  committed
  bc6ab77

  Copy full SHA for bc6ab77

• Resolving merge conflicts

  vcerenu

  committed
  6e0311a

  Copy full SHA for 6e0311a

• Resolving merge conflicts

  vcerenu

  committed
  a7bb241

  Copy full SHA for a7bb241

• Merge pull request #1710 from wazuh/merge-4.10.2-into-4.11.0

  Show description for f49bba3
  c-bordon

  authored
  f49bba3

  Copy full SHA for f49bba3

• Resolving merge conflicts

  vcerenu

  committed
  6e432a1

  Copy full SHA for 6e432a1