Commit Graph
25 Commits
Author SHA1 Message Date
Alberto Rodríguez 9cd399c2df Merge pull request #598 from wazuh/4.2-merge_master
Merge 4.2 into master
2022-03-28 16:58:01 +02:00
Alberto Rodríguez a4be008028 Merge pull request #596 from wazuh/595-bump_426
Bump to 4.2.6
2022-03-28 15:49:25 +02:00
Alberto R 84fe19e868 Bumped to 4.4.0 2021-11-24 17:01:09 +01:00
Alberto Rodríguez 2a297bab38 Merge pull request #527 from wazuh/merge-42-into-master
Merge 4.2 in master
2021-10-04 15:42:01 +02:00
Alberto Rodríguez f34b7d0465 Merge pull request #522 from wazuh/512-make-utils-persistent
Make utils.py file persistent when using volumes
2021-09-29 10:27:50 +02:00
Alberto Rodríguez e99ba259e0 Added util.py to permanent data 2021-09-23 20:00:03 +02:00
Alberto Rodríguez f00245007d Merge pull request #516 from wazuh/4.2.2
Release v4.2.2
2021-09-15 16:50:12 +02:00
Alberto Rodríguez afd70ff5f9 Merge pull request #513 from wazuh/4.2.1
Release v4.2.1
2021-09-14 15:12:06 +02:00
Alberto Rodríguez 1ed0bc8e01 Merge pull request #503 from wazuh/update-4.2
Update 4.2
2021-08-26 16:17:13 +02:00
Alberto R 64c61bcdbf Fixed mode Kibana settings 2021-06-28 23:35:30 +02:00
Alberto Rodríguez 4b75a6679b Merge pull request #483 from wazuh/orsifacundo-production_cluster-changes
Add admin keypair to production deployment
2021-06-10 08:06:35 +02:00
Alberto Rodríguez 5074eb0b44 Merge pull request #479 from wazuh/476-update-4.2
Bump ODFE 3.13.2 on Wazuh 4.2.0
2021-05-24 14:03:33 +02:00
Alberto Rodríguez 7b56e2425b Merge pull request #478 from wazuh/476-update-master
Bump to ODFE 1.13.2
2021-05-24 12:56:32 +02:00
Alberto Rodríguez 5f84a7eac2 Merge pull request #467 from wazuh/4.3
Merge 4.3 in master
2021-05-24 09:34:27 +02:00
Alberto Rodríguez 2eb9b7c8fc Merge pull request #447 from npdgm/master
fix: missing directory for tasks manager db
2021-05-11 09:27:45 +02:00
Alberto Rodríguez 09731ec148 Merge pull request #473 from wazuh/457-nginx-conf-readme-4.2
457: Broken link fix and removed deprecated information at README
2021-04-29 14:35:31 +02:00
Alberto Rodríguez dfa4ed7d00 Merge pull request #472 from wazuh/4.1
Merge 4.1 in master
2021-04-23 19:59:31 +02:00
Alberto Rodríguez 81f46b908a Merge pull request #470 from wazuh/bump-4.1.5
Bumped to 4.1.5
2021-04-22 18:56:52 +02:00
Alberto RodríguezandVíctor Moreno Jiménez 53bbddd754 Update VERSION
Co-authored-by: Víctor Moreno Jiménez <victor.moreno@wazuh.com>
2021-04-22 18:06:12 +02:00
Alberto R 7c3384f9a3 Bumped to 4.1.5 2021-04-22 17:43:49 +02:00
Alberto Rodríguez be3ecc1f80 Merge pull request #463 from wazuh/448-rename-users-groups
Rename users and group according to Wazuh standard
2021-04-14 15:09:26 +02:00
Alberto Rodríguez 1cf4376e3b Merge pull request #461 from wazuh/feature-name-change
Feature name change
2021-04-13 17:27:20 +02:00
Alberto Rodríguez 60c5b53844 Merge pull request #456 from wazuh/bump-4.1.4
Bump to v4.1.4
2021-03-26 15:11:11 +01:00
Alberto Rodríguez 89754be5cf Merge pull request #455 from wazuh/bump-4.1.3
Bump to 4.1.3
2021-03-23 18:09:31 +01:00
Alberto Rodríguez 110f30148e Merge pull request #445 from wazuh/release-wazuh_4.1.1
Bump to 4.1.1
2021-02-25 17:50:03 +01:00