afmarulanda/wazuh-ansible-4.8.1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
Nicolas Lastra 2021-10-21 10:36:00 -03:00
parent 0d2d63271a
commit f4ee80f10f
No known key found for this signature in database
GPG Key ID: 749E0D60DEC5E4D8
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/wazuh/ansible-wazuh-agent/defaults/main.yml
View File

@ -1,8 +1,4 @@
--- ---
<<<<<<< HEAD
=======
wazuh_agent_version: 4.2.4-1
>>>>>>> 4.2
wazuh_agent_version: 4.3.0-1 wazuh_agent_version: 4.3.0-1
@ -16,11 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""
wazuh_agent_sources_installation: wazuh_agent_sources_installation:
enabled: false enabled: false
<<<<<<< HEAD
branch: "v4.3.0" branch: "v4.3.0"
=======
branch: "v4.2.4"
>>>>>>> 4.2
user_language: "y" user_language: "y"
user_no_stop: "y" user_no_stop: "y"
user_install_type: "agent" user_install_type: "agent"