[GitHub] incubator-metron pull request #224: METRON-387 Fix Bad Merge with METRON-309

2016-08-22 Thread asfgit
Github user asfgit closed the pull request at: https://github.com/apache/incubator-metron/pull/224 --- 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

[GitHub] incubator-metron pull request #224: METRON-387 Fix Bad Merge with METRON-309

2016-08-22 Thread nickwallen
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