[jira] [Created] (METRON-2318) Merge master into feature branch

[Shane Ardell (Jira)]

Shane Ardell created METRON-2318:
------------------------------------

             Summary: Merge master into feature branch
                 Key: METRON-2318
                 URL: https://issues.apache.org/jira/browse/METRON-2318
             Project: Metron
          Issue Type: Sub-task
            Reporter: Shane Ardell


The feature branch is once again out-of-date, and there are many conflicts to 
resolve. For this reason, I'm creating a ticket to separate the resolved 
conflicts with other work.



--
This message was sent by Atlassian Jira
(v8.3.4#803005)