GitHub user nickwallen opened a pull request:
https://github.com/apache/incubator-metron/pull/224
METRON-387 Fix Bad Merge with METRON-309
The merge of METRON-309 after the changes introduced by METRON-366 were not
successful. The build of master is currently failing. This PR fixes the
glitch.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/nickwallen/incubator-metron METRON-387
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-metron/pull/224.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #224
----
commit 5ddd08e8bbb84353b06acff0dc1fb5d8521f08bc
Author: Nick Allen <[email protected]>
Date: 2016-08-22T17:17:39Z
METRON-387 Fix Bad Merge with METRON-309
----
---
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.
---
