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:49 UTC
[08/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/a35e3877
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/a35e3877
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/a35e3877
Branch: refs/heads/master
Commit: a35e387745d3303e03efb9b63b9e31ae97ade812
Parents: 587e579 2f579a9
Author: Otto Fowler <of...@industrialdefender.com>
Authored: Thu Oct 6 17:26:32 2016 -0400
Committer: Otto Fowler <of...@industrialdefender.com>
Committed: Thu Oct 6 17:26:32 2016 -0400
----------------------------------------------------------------------
.../vagrant/full-dev-platform/README.md | 2 +-
.../vagrant/full-dev-platform/Vagrantfile | 2 +-
.../vagrant/full-dev-platform/run.sh | 20 -----------------
.../vagrant/quick-dev-platform/README.md | 6 ++---
.../vagrant/quick-dev-platform/Vagrantfile | 4 ++--
.../vagrant/quick-dev-platform/run.sh | 23 --------------------
6 files changed, 7 insertions(+), 50 deletions(-)
----------------------------------------------------------------------