Github user mmiklavc commented on the issue:
https://github.com/apache/metron/pull/1165
@tiborm - I'm a little uneasy about the merge conflicts and commit history,
as pointed out by @merrimanr. The number of changes *seems* relatively small,
but per Ryan's review it looks like we had some previously-fixed regressions
sneak back in. Also, there are merge conflicts showing in PcapCliTest, which
I'm 100% certain you will not have modified in any way. Can you close/modify
this PR by applying these changes on top of a fresh feature branch pull and
then re-submitting? That should eliminate some ambiguity with the merge.
---
