It was this commit: https://github.com/apache/incubator-metron/commit/8cf109da180ee9f80984b0408afed799fa6c7c43
Looks like a case of simultaneous modification. Merging both is probably the trivially correct fix. On 5/9/17, 1:58 PM, "Otto Fowler" <[email protected]> wrote: %changelog <<<<<<< HEAD * Thu May 4 2017 Ryan Merriman <[email protected]> - 0.4.0 - Added REST * Fri Apr 28 2017 Apache Metron <[email protected]> - 0.4.0 - Add Zeppelin Connection Report Dashboard ======= * Tue May 2 2017 David Lyle <[email protected]> - 0.4.0 - Add Metron IP Report >>>>>>> 1cace9ff29f31301d74fa6a7b2630d471452e985 too On May 9, 2017 at 16:51:53, Otto Fowler ([email protected]) wrote: I just tried to merge in master, and got conflicts in metron.spec. Which is not unusual since spec files are awesome. But I was sing a head>>>>>> commit>>>>>> set of comments, that was weird. When I look at the actual code file in github on the web, the statement is actually in github. Like we did a commit of the conflict file <<<<<<< HEAD %{metron_home}/config/zeppelin/metron/metron-connection-report.json ======= %{metron_home}/config/zeppelin/metron/metron-ip-report.json >>>>>>> 1cace9ff29f31301d74fa6a7b2630d471452e985 So I don’t think the rpms are going to build off of this.
