Re: Switch gerrit merge strategy to "rebase always"?

2017-12-11 Thread Philip Zeyliger
Seems like it's the right thing to do. On Mon, Dec 11, 2017 at 11:43 AM, Tim Armstrong wrote: > We recently had a bad merge that was allowed by the cherry-pick merge > strategy merging a simple without its ancestor (since they didn't change > any nearby lines): >

Re: [DISCUSS] 2.11.0 release

2017-12-11 Thread Jim Apple
sgtm On Mon, Dec 11, 2017 at 1:49 PM, Thomas Tauber-Marshall < tmarsh...@cloudera.com> wrote: > Now that the issues that were brought up here have gone in, I propose that > we branch 2.11 at: > > commit b4cf5f2174b338c097e42d43c32b494a6e0b46c0 > Author: Thomas Tauber-Marshall

Re: Re:Re: Build failure in TestAdmissionController

2017-12-11 Thread Thomas Tauber-Marshall
On Sun, Dec 10, 2017 at 2:38 PM Quanlong Huang wrote: > Hi all, > > > I've fixed all the test failures in my dev environment and here is the > patch: https://gerrit.cloudera.org/#/c/8807/ > It has passed the gerrit-verify-dryrun-external test and here is the link: >