Merge branch 'master' into feature-adapt-major-version

2020-10-23 17:30:57 +02:00 · 2020-10-23 17:30:57 +02:00 · a9f96ff495
commit a9f96ff495
parent 9870df0917 fec24b4f6d
3 changed files with 4 additions and 4 deletions
--- a/2
+++ b/2
@ -1,5 +1,5 @@

- Portions Copyright (C) 2018 Wazuh, Inc.
+ Portions Copyright (C) 2020 Wazuh, Inc.
 Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc.

 This program is a free software; you can redistribute it and/or modify
--- a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml
@ -1,6 +1,6 @@
 ---
 # Cluster Settings
-es_version: "7.8.0"
+es_version: "7.9.1"
 es_major_version: "7.x"

 opendistro_version: 1.10.1
--- a/roles/wazuh/ansible-wazuh-agent/README.md
+++ b/roles/wazuh/ansible-wazuh-agent/README.md
@ -47,7 +47,7 @@ The following is an example of how this role can be used:
 License and copyright
 ---------------------

-WAZUH Copyright (C) 2018 Wazuh Inc. (License GPLv3)
+WAZUH Copyright (C) 2020 Wazuh Inc. (License GPLv3)

 ### Based on previous work from dj-wasabi