As soon as my prepare-commit vagrant up finishes. Knew it. lol
On May 10, 2017 at 08:45:02, Justin Leet ([email protected]) wrote: PR is merged into master. Build should be good to go. On Tue, May 9, 2017 at 6:23 PM, David Lyle <[email protected]> wrote: > Ah, nothing zigged when it should have zagged on that end. There's > something wrong on my end. The master I had was older than it should have > been, not sure why yet, but I'll dig into it. In the meantime, the PR is > up. > > -D... > > > On Tue, May 9, 2017 at 5:58 PM, Otto Fowler <[email protected]> > wrote: > > > I don’t think I said what I meant. > > I meant that they could investigate what happened from logs etc. rather > > than they would actually do any > > git commits or history modifications. > > > > > > > > On May 9, 2017 at 17:45:03, David Lyle ([email protected]) wrote: > > > > Seems like more trouble than it's worth. I have a patch in test now. > > > > On Tue, May 9, 2017 at 5:24 PM, Otto Fowler <[email protected]> > > wrote: > > > > > I wonder if an INFRA ticket is in order? > > > they can muck about with the git history. > > > > > > > > > > > > On May 9, 2017 at 17:19:34, David Lyle ([email protected]) wrote: > > > > > > That's exactly what it is. Strangely, git didn't indicate I had a merge > > > conflict during the commit (?). > > > > > > Anyhoo- I'll push a pr shortly with both. Sorry for the trouble. > > > > > > -D... > > > > > > > > > On Tue, May 9, 2017 at 5:04 PM, Matt Foley <[email protected]> > > > wrote: > > > > > > > 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. > > > > > > > > > > > > > > > > > > > > > > >
