It's probably a good idea to delete the sentry-ha-redesign branch now to prevent accidental commits to it instead of master.
Colm. On Fri, Jul 28, 2017 at 6:20 PM, Kalyan Kumar Kalvagadda < kkal...@cloudera.com> wrote: > Thanks sasha > > -Kalyan > > On Fri, Jul 28, 2017 at 12:11 PM, Vamsee Yarlagadda <vam...@cloudera.com> > wrote: > > > Thanks Sasha. > > > > On Fri, Jul 28, 2017 at 10:09 AM, Alexander Kolbasov <ak...@cloudera.com > > > > wrote: > > > > > Hello everyone. > > > > > > The sentry master is now merged with sentry-ha-redesign branch. The > merge > > > replaced all the conflicts with the version of sentry-ha-redesign. > > > > > > Please stop using sentry-ha-redesign branch and continue working on > > master > > > for all 2.0.0 work. > > > > > > Best, > > > > > > - Alex Kolbasov. > > > > > > > > > > > -- > > Thanks, > > Vamsee > > > -- Colm O hEigeartaigh Talend Community Coder http://coders.talend.com
