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:45 UTC

[04/19] incubator-metron git commit: merging remote-tracking branch apache/master

merging 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/0c496c20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/0c496c20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/0c496c20

Branch: refs/heads/master
Commit: 0c496c20769fc0c9ac8ef209b1f2e08baee38c80
Parents: a825142 5378f0c
Author: Otto Fowler <of...@industrialdefender.com>
Authored: Tue Sep 27 10:00:28 2016 -0400
Committer: Otto Fowler <of...@industrialdefender.com>
Committed: Tue Sep 27 10:00:28 2016 -0400

----------------------------------------------------------------------
 .../common/dsl/FunctionResolverSingleton.java   |   3 +-
 .../common/stellar/shell/PausableInput.java     | 373 +++++++++++++++++++
 .../common/stellar/shell/StellarExecutor.java   |  13 +-
 .../common/stellar/shell/StellarShell.java      |   5 +-
 metron-platform/metron-management/README.md     |   5 +
 .../management/ParserConfigFunctions.java       |   3 +-
 .../metron/management/ShellFunctions.java       | 108 +++++-
 .../metron/management/ShellFunctionsTest.java   |   7 +
 .../org/apache/metron/parsers/GrokParser.java   |   6 +-
 .../metron/parsers/json/JSONMapParser.java      |  21 +-
 .../metron/parsers/json/JSONMapParserTest.java  |  30 +-
 11 files changed, 549 insertions(+), 25 deletions(-)
----------------------------------------------------------------------