Github user justinleet commented on the issue:
https://github.com/apache/incubator-metron/pull/363
You mean from https://github.com/apache/incubator-metron/pull/344? I
already fixed the conflicts from it.
I can merge master back in again if you want, but the only commits in
master and not my branch appear to be:
METRON-584 STELLAR should have a TO_LONG Function (ottobackwards) closes
apache/incubator-metron#368
METRON-575 State from different profiles can be co-mingled incorrectly
(nickwallen) closes apache/incubator-metron#362
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
