Merge branch 'master' into feature/METRON-1554-pcap-query-panel
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/89726659 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/89726659 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/89726659 Branch: refs/heads/master Commit: 897266598b7984884d6cf8a6a699fe902e792483 Parents: 09a7f18 1b2bdff Author: merrimanr <merrim...@gmail.com> Authored: Mon Aug 6 11:08:48 2018 -0500 Committer: merrimanr <merrim...@gmail.com> Committed: Mon Aug 6 11:08:48 2018 -0500 ---------------------------------------------------------------------- .../METRON/CURRENT/repos/repoinfo.xml | 7 ++ .../packaging/docker/ansible-docker/Dockerfile | 118 ++++++++++++------- .../packaging/docker/deb-docker/Dockerfile | 23 ++-- .../packaging/docker/rpm-docker/Dockerfile | 46 ++++++-- metron-sensors/pycapa/README.md | 47 +++++--- 5 files changed, 156 insertions(+), 85 deletions(-) ----------------------------------------------------------------------
