This is an automated email from the ASF dual-hosted git repository. nickallen pushed a commit to branch feature/METRON-2088-support-hdp-3.1 in repository https://gitbox.apache.org/repos/asf/metron.git
commit 09bd6295ee56a1c593900561e6b7fa8f501020f5 Merge: f300ce3 92220ce Author: Nick Allen <[email protected]> AuthorDate: Mon Sep 23 15:43:20 2019 -0400 Merge remote-tracking branch 'apache/master' into feature/METRON-2088-support-hdp-3.1 .../roles/metron-builder/tasks/build-rpms.yml | 4 +- metron-deployment/development/centos6/README.md | 22 +++ metron-deployment/development/centos6/Vagrantfile | 1 + metron-deployment/development/centos6/ansible.cfg | 1 + metron-deployment/development/centos7/Vagrantfile | 4 +- metron-deployment/development/centos7/ansible.cfg | 1 + metron-deployment/development/ubuntu14/Vagrantfile | 1 + .../packaging/docker/rpm-docker/build.sh | 6 +- metron-interface/metron-alerts/package-lock.json | 167 +++++++-------------- metron-interface/metron-alerts/package.json | 2 +- 10 files changed, 91 insertions(+), 118 deletions(-)
