metron-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Casey Stella <ceste...@gmail.com>
Subject Re: Unclear recent commit
Date Sat, 09 Sep 2017 02:18:55 GMT
That's very weird.

On Fri, Sep 8, 2017 at 10:12 PM, Otto Fowler <ottobackwards@gmail.com>
wrote:

> without re-writing my other reply:
> I use the prepare-commit into a clean repo every time, so I believe that
> this issue
> *was* in the apache repo.
>
>
> On September 8, 2017 at 22:08:02, Casey Stella (cestella@gmail.com) wrote:
>
> My guess is that what happened was otto did a pull of METRON-1061 into his
> master, but it wasn't *quite* in sync with master in apache and there was
> a
> conflict in the dependencies_with_url.csv, so that commit was made locally
> to fix the conflict. both commits, the squashed and the merge conflict
> commit were pushed to apache master.
>
> Otto, is that correct or am I just babbling on a friday night late? ;)
>
> On Fri, Sep 8, 2017 at 8:52 PM, Zeolla@GMail.com <zeolla@gmail.com>
> wrote:
>
> > I was looking through some of the recent commits and I noticed this[1],
> > anybody know what the back story is there?
> >
> > 1:
> > https://github.com/apache/metron/commit/c8e84fa3be89901013168d15df38b8
> > a58265148a
> >
> > Jon
> > --
> >
> > Jon
> >
>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message