You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by sa...@apache.org on 2019/11/20 16:57:18 UTC
[metron] 01/01: Merge branch 'master' into
feature/METRON-1856-parser-aggregation
This is an automated email from the ASF dual-hosted git repository.
sardell pushed a commit to branch feature/METRON-1856-parser-aggregation
in repository https://gitbox.apache.org/repos/asf/metron.git
View the commit online:
https://github.com/apache/metron/commit/92fc9ff691b706c6bd5790a88b7d3bfba389fd50
commit 92fc9ff691b706c6bd5790a88b7d3bfba389fd50
Merge: 661391f 2068820
Author: Shane Ardell <sh...@gmail.com>
AuthorDate: Wed Nov 20 10:56:32 2019 -0600
Merge branch 'master' into feature/METRON-1856-parser-aggregation
dependencies_with_url.csv | 2 -
metron-analytics/metron-maas-service/pom.xml | 3 ++
metron-analytics/metron-profiler-client/pom.xml | 3 ++
metron-analytics/metron-profiler-repl/pom.xml | 7 +++
metron-analytics/metron-profiler-spark/pom.xml | 3 ++
metron-analytics/metron-profiler-storm/pom.xml | 3 ++
metron-analytics/metron-statistics/pom.xml | 3 ++
metron-contrib/metron-performance/pom.xml | 3 ++
.../roles/ambari_common/tasks/nodejs-CentOS-6.yml | 2 +-
.../roles/ambari_common/tasks/nodejs-CentOS-7.yml | 2 +-
.../roles/ambari_common/tasks/nodejs-Ubuntu-14.yml | 2 +-
.../packaging/docker/ansible-docker/Dockerfile | 2 +-
.../packaging/docker/deb-docker/Dockerfile | 2 +-
.../packaging/docker/rpm-docker/Dockerfile | 2 +-
.../packaging/docker/rpm-docker/SPECS/metron.spec | 3 ++
metron-interface/metron-alerts/.nvmrc | 2 +-
metron-interface/metron-alerts/pom.xml | 4 +-
metron-interface/metron-config/.nvmrc | 1 +
metron-interface/metron-config/pom.xml | 4 +-
.../src/app/shared/metron-dialog-box.ts | 4 +-
metron-interface/metron-config/src/styles.scss | 2 +-
metron-interface/metron-rest/pom.xml | 16 +++++++
metron-platform/elasticsearch-shaded/pom.xml | 3 ++
metron-platform/metron-common/pom.xml | 9 ++++
metron-platform/metron-data-management/pom.xml | 4 +-
.../metron-elasticsearch-storm/pom.xml | 3 ++
.../metron-enrichment-common/pom.xml | 6 +++
.../metron-enrichment-storm/pom.xml | 6 +++
metron-platform/metron-hbase-client/pom.xml | 6 +++
metron-platform/metron-hbase-server/pom.xml | 3 ++
.../metron-indexing/metron-indexing-common/pom.xml | 3 ++
metron-platform/metron-management/pom.xml | 3 ++
.../metron-parsing/metron-parsers-common/pom.xml | 6 +++
.../metron-parsing/metron-parsers/pom.xml | 6 +++
.../metron-parsing/metron-parsing-storm/pom.xml | 6 +++
metron-platform/metron-pcap-backend/pom.xml | 3 ++
metron-platform/metron-pcap/pom.xml | 6 +++
.../metron-solr/metron-solr-common/pom.xml | 3 ++
.../metron-solr/metron-solr-storm/pom.xml | 3 ++
.../metron-storm-kafka-override/pom.xml | 3 ++
metron-platform/metron-test-utilities/pom.xml | 6 +++
.../metron-writer/metron-writer-common/pom.xml | 3 ++
metron-stellar/stellar-common/pom.xml | 13 +++++-
.../common/utils/StellarProcessorUtils.java | 53 ++++++++++++----------
44 files changed, 190 insertions(+), 42 deletions(-)