Merge branch 'master' into feature/METRON-1416-upgrade-solr
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/9b25084c Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/9b25084c Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/9b25084c Branch: refs/heads/master Commit: 9b25084c83e484b8119caf134a473fcb6306fa6a Parents: 67d6c0e fa86663 Author: cstella <ceste...@gmail.com> Authored: Thu Feb 8 17:22:12 2018 -0500 Committer: cstella <ceste...@gmail.com> Committed: Thu Feb 8 17:22:12 2018 -0500 ---------------------------------------------------------------------- .../roles/ambari_common/defaults/main.yml | 6 +- .../ambari_common/tasks/elasticsearch-repo.yml | 40 ------ .../ansible/roles/ambari_common/tasks/main.yml | 1 - .../roles/ambari_config/tasks/dependencies.yml | 11 +- .../packaging/ambari/metron-mpack/README.md | 14 -- .../ELASTICSEARCH/5.6.2/repos/repoinfo.xml | 13 ++ .../KIBANA/5.6.2/repos/repoinfo.xml | 19 +++ .../5.6.2/configuration/elastic-jvm-options.xml | 144 +++++++++++++++++++ .../5.6.2/configuration/elastic-sysconfig.xml | 12 +- .../ELASTICSEARCH/5.6.2/metainfo.xml | 1 + .../5.6.2/package/scripts/elastic_commands.py | 13 ++ .../5.6.2/package/scripts/params.py | 3 + site/documentation/index.md | 2 +- 13 files changed, 202 insertions(+), 77 deletions(-) ----------------------------------------------------------------------
