Merge branch 'master' into feature-adapt-major-version
This commit is contained in:
commit
a9f96ff495
2
LICENSE
2
LICENSE
@ -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.
|
Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc.
|
||||||
|
|
||||||
This program is a free software; you can redistribute it and/or modify
|
This program is a free software; you can redistribute it and/or modify
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
# Cluster Settings
|
# Cluster Settings
|
||||||
es_version: "7.8.0"
|
es_version: "7.9.1"
|
||||||
es_major_version: "7.x"
|
es_major_version: "7.x"
|
||||||
|
|
||||||
opendistro_version: 1.10.1
|
opendistro_version: 1.10.1
|
||||||
|
|||||||
@ -47,7 +47,7 @@ The following is an example of how this role can be used:
|
|||||||
License and copyright
|
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
|
### Based on previous work from dj-wasabi
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user