I think that's a consequence of the "cherry pick" merge strategy. It does
seem like a flaw in our merge process. It would be nice if we could
configure gerrit so that it didn't merge patches where the parent isn't a
commit on the master branch.

On Tue, Dec 5, 2017 at 9:31 PM, Sailesh Mukil <[email protected]> wrote:

> Sorry about that. I thought they would both be merged together, but it
> looks like that wasn't the case.
>
> On Tue, Dec 5, 2017 at 6:22 PM, Michael Ho <[email protected]> wrote:
>
> > Thanks Tim for fixing it and Jin Chul for investigating the problem.
> Sorry
> > for missing that during code review.
> >
> > On Tue, Dec 5, 2017 at 6:00 PM, Tim Armstrong <[email protected]>
> > wrote:
> >
> > > Thanks for investigating Jin Chul. I came to the same conclusion and
> > merged
> > > the change.
> > >
> > > On Tue, Dec 5, 2017 at 5:57 PM, Jin Chul Kim <[email protected]>
> wrote:
> > >
> > > > Hi,
> > > >
> > > > Currently Impala build is broken because the child change was merged
> > > > without the merge of the parent change.
> > > >
> > > > (parent) https://gerrit.cloudera.org/#/c/8760/: [security] Make the
> > > > kerberos principal configurable for Kudu servers
> > > >
> > > > (child) https://gerrit.cloudera.org/#/c/8761/: IMPALA-6256:
> Incorrect
> > > > principal will be used for internal connections if FLAGS_be_principal
> > is
> > > > set
> > > >
> > > > A workaround: cherry-pick the parent change.
> > > >
> > > > Best regards,
> > > > Jinchul
> > > >
> > >
> >
> >
> >
> > --
> > Thanks,
> > Michael
> >
>

Reply via email to