Code

Merge 4.9.0 into master#1327

Code

Merged

teddytpc1 merged 28 commits intomasterwazuh/wazuh-docker:masterfrom merge-4.9.0-into-masterwazuh/wazuh-docker:merge-4.9.0-into-masterCopy head branch name to clipboardApr 30, 2024

+11-5

Commits

Commits on Apr 5, 2024

• Bumped revision to 40807

  davidcr01

  committed
  cbeb18c

  Copy full SHA for cbeb18c

• Merge pull request #1288 from wazuh/bump-revision-40807

  Show description for 74e30e8
  davidcr01

  authored
  74e30e8

  Copy full SHA for 74e30e8

Commits on Apr 10, 2024

• Changed Docker base image ocurrences from amazonlinux:2023.3.20240304.0 to amazonlinux:2023

  CarlosALgit

  committed
  92d6f87

  Copy full SHA for 92d6f87

• Merge pull request #1294 from wazuh/1293-fix-480-beta5-al2023-vulnerabilities

  Show description for b62a1d5
  teddytpc1

  authored
  b62a1d5

  Copy full SHA for b62a1d5

Commits on Apr 18, 2024

• Bumped version to 4.7.4

  davidcr01

  committed
  d904595

  Copy full SHA for d904595

• Merge pull request #1300 from wazuh/bump-version-4.7.4

  Show description for d2181f7
  teddytpc1

  authored
  d2181f7

  Copy full SHA for d2181f7

Commits on Apr 19, 2024

• Bumped revision to 40808

  davidcr01

  committed
  353ea59

  Copy full SHA for 353ea59

• Merge pull request #1303 from wazuh/bump-revision-40808

  Show description for c9cf940
  vcerenu

  authored
  c9cf940

  Copy full SHA for c9cf940

• add beta6 tag

  vcerenu

  committed
  650d293

  Copy full SHA for 650d293

• Merge pull request #1304 from wazuh/beta6-tag

  Show description for a9efe64
  vcerenu

  authored
  a9efe64

  Copy full SHA for a9efe64

• revert beta6 changes

  vcerenu

  committed
  72421d6

  Copy full SHA for 72421d6

• Merge pull request #1305 from wazuh/revert-beta6

  Show description for 1e7d1c6
  vcerenu

  authored
  1e7d1c6

  Copy full SHA for 1e7d1c6

Commits on Apr 23, 2024

• Bumped revision to 40716

  davidcr01

  committed
  8c87423

  Copy full SHA for 8c87423

• Merge pull request #1309 from wazuh/bump-revision-40716

  Show description for 9881957
  davidcr01

  authored
  9881957

  Copy full SHA for 9881957

• Updated tag for 4.7.4 RC1

  davidcr01

  committed
  daf1e83

  Copy full SHA for daf1e83

• Merge pull request #1310 from wazuh/change-tag-4.7.4-rc1

  Show description for 2efc6c5
  davidcr01

  authored
  2efc6c5

  Copy full SHA for 2efc6c5

• Reverted tag for 4.7.4 RC1

  davidcr01

  committed
  9109104

  Copy full SHA for 9109104

• Merge pull request #1311 from wazuh/revert-tag-4.7.4-rc1

  Show description for 3bed3a3
  davidcr01

  authored
  3bed3a3

  Copy full SHA for 3bed3a3

Commits on Apr 25, 2024

• bump revision

  vcerenu

  committed
  ee3159b

  Copy full SHA for ee3159b

• Merge pull request #1316 from wazuh/bump-revision-474

  Show description for 81c42d0
  vcerenu

  authored
  81c42d0

  Copy full SHA for 81c42d0

• change image version

  vcerenu

  committed
  b760931

  Copy full SHA for b760931

• Merge pull request #1317 from wazuh/change-image-rc2

  davidcr01

  authored
  d10af3b

  Copy full SHA for d10af3b

• rollback image name

  vcerenu

  committed
  ce0a855

  Copy full SHA for ce0a855

• Merge pull request #1318 from wazuh/rollback-image-version

  davidcr01

  authored
  ec76ea8

  Copy full SHA for ec76ea8

Commits on Apr 30, 2024

• resolving conflicts

  vcerenu

  committed
  4c74ebf

  Copy full SHA for 4c74ebf

• Merge pull request #1324 from wazuh/merge-4.7.4-into-4.8.0

  Show description for 7063480
  vcerenu

  authored
  7063480

  Copy full SHA for 7063480

• resolving conflicts

  vcerenu

  committed
  390a71e

  Copy full SHA for 390a71e

• Merge pull request #1325 from wazuh/merge-4.8.0-into-4.9.0

  Show description for b022f9f
  vcerenu

  authored
  b022f9f

  Copy full SHA for b022f9f