Merge pull request #534 from wazuh/503-merge-master

Merge 4.2 in master
This commit is contained in:
José Fernández Aguilera
2021-10-13 09:34:24 +02:00
committed by GitHub
4 changed files with 10 additions and 4 deletions
+5
View File
@@ -6,6 +6,11 @@ All notable changes to this project will be documented in this file.
- Update Wazuh to version [4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
## Wazuh Docker v4.2.3
### Added
- Update Wazuh to version [4.2.3](https://github.com/wazuh/wazuh/blob/v4.2.3/CHANGELOG.md#v423)
## Wazuh Docker v4.2.2
### Added
+1
View File
@@ -154,6 +154,7 @@ ADMIN_PRIVILEGES=true # App privileges
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.3.0 | 1.13.2 | 7.11.2 |
| v4.2.3 | 1.13.2 | 7.11.2 |
| v4.2.2 | 1.13.2 | 7.11.2 |
| v4.2.1 | 1.13.2 | 7.11.2 |
| v4.2.0 | 1.13.2 | 7.10.2 |
@@ -200,8 +200,8 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>4.2.2.1</white_list>
<white_list>4.2.2.2</white_list>
<white_list>4.3.0.1</white_list>
<white_list>4.3.0.2</white_list>
<white_list>208.67.220.220</white_list>
</global>
@@ -200,8 +200,8 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>4.2.2.1</white_list>
<white_list>4.2.2.2</white_list>
<white_list>4.3.0.1</white_list>
<white_list>4.3.0.2</white_list>
<white_list>208.67.220.220</white_list>
</global>