You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ot...@apache.org on 2016/10/31 13:07:50 UTC
[09/19] incubator-metron git commit: merge remote tracking branch
apache/master
merge remote tracking branch apache/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/56686c05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/56686c05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/56686c05
Branch: refs/heads/master
Commit: 56686c058541bb13732641b99aef8fccff8490a0
Parents: a35e387 a2a5a3d
Author: Otto Fowler <of...@industrialdefender.com>
Authored: Tue Oct 11 09:30:35 2016 -0400
Committer: Otto Fowler <of...@industrialdefender.com>
Committed: Tue Oct 11 09:30:35 2016 -0400
----------------------------------------------------------------------
.gitignore | 1 +
LICENSE | 2 +-
.../src/test/resources/maas/dummy_rest.sh | 19 ++-
.../2.3.3/configuration/elastic-site.xml | 10 +-
.../2.3.3/package/scripts/params.py | 1 +
.../templates/elasticsearch.master.yaml.j2 | 2 +-
.../templates/elasticsearch.slave.yaml.j2 | 2 +-
.../METRON/0.2.1BETA/metainfo.xml | 4 +-
metron-platform/metron-common/README.md | 14 +++
.../StellarTransformationTest.java | 33 ++++++
.../extractor/stix/StixExtractorTest.java | 116 +++----------------
.../src/test/resources/stix_example.xml | 49 ++++++++
.../resources/stix_example_wo_conditions.xml | 49 ++++++++
.../java/org/apache/metron/pcap/Endianness.java | 33 ------
.../apache/metron/spout/pcap/Endianness.java | 33 ++++++
15 files changed, 226 insertions(+), 142 deletions(-)
----------------------------------------------------------------------