Merge 4.2 into master

2021-09-30 16:33:20 -03:00
parent e99ba259e0 f34b7d0465
commit 61b44c37cc
17 changed files with 50 additions and 38 deletions
@@ -27,8 +27,13 @@ nodes:
  - name: filebeat
    dn: CN=filebeat,OU=Ops,O=Example\, Inc.,DC=example,DC=com
    dns: 
+<<<<<<< HEAD
      - wazuh

+=======
+      - wazuh 
+      
+>>>>>>> f34b7d0465dbc8bf717d81e2bc4f13f44a03a55d
 clients:
  - name: admin
    dn: CN=admin,OU=Ops,O=Example\, Inc.,DC=example,DC=com