Accident on master branch

[Konstantin Boudnik <co...@apache.org>]

Guys,

I have accidently pushed my local integration branch to our repo and messed up
the master a little bit. My The force-pushes are prohibited so I can't do quick
fix and will have to file INFRA ticket to move the master. 

The correct version of the master branch is right now on master.fixed, but it
might take some time for INFRA folks to make the move. So, please be patient
and do not commit anything to the messed up master yet.

Sorry about the mess ;(
-- 
Regards,
  Cos

Re: Accident on master branch

[Konstantin Boudnik <co...@apache.org>]

Guys,

all is back to normal - the master has been restored, so we are good to go. If
you had pulled the master branch between the time of the incident and now, you
might want to re-fetch it and hard-reset your local branch against the remote.

Thanks,
  Cos
   
On Fri, Apr 25, 2014 at 10:18PM, Konstantin Boudnik wrote:
> We aren't stuck as we can freely commit to master.fixed - which is right as a
> rain. As for revert: I'd rather use it as a last resort, because there's a
> whole bunch of commits that would need to be reverted. 
> 
> I have opened a JIRA ticket and pinging INFRA on #asfinfra, so the hope is to
> get it resolved soon. Again - my sincere apologies.
> 
> Cos
> 
> On Fri, Apr 25, 2014 at 05:11PM, Alejandro Abdelnur wrote:
> > how about committing a revert and then asking infra to remove both commits, then nobody is stuck
> > 
> > Alejandro
> > (phone typing)
> > 
> > > On Apr 25, 2014, at 14:38, Konstantin Boudnik <co...@apache.org> wrote:
> > > 
> > > Guys,
> > > 
> > > I have accidently pushed my local integration branch to our repo and messed up
> > > the master a little bit. My The force-pushes are prohibited so I can't do quick
> > > fix and will have to file INFRA ticket to move the master. 
> > > 
> > > The correct version of the master branch is right now on master.fixed, but it
> > > might take some time for INFRA folks to make the move. So, please be patient
> > > and do not commit anything to the messed up master yet.
> > > 
> > > Sorry about the mess ;(
> > > -- 
> > > Regards,
> > >  Cos
> > > 

Re: Accident on master branch

[Konstantin Boudnik <co...@apache.org>]

We aren't stuck as we can freely commit to master.fixed - which is right as a
rain. As for revert: I'd rather use it as a last resort, because there's a
whole bunch of commits that would need to be reverted. 

I have opened a JIRA ticket and pinging INFRA on #asfinfra, so the hope is to
get it resolved soon. Again - my sincere apologies.

Cos

On Fri, Apr 25, 2014 at 05:11PM, Alejandro Abdelnur wrote:
> how about committing a revert and then asking infra to remove both commits, then nobody is stuck
> 
> Alejandro
> (phone typing)
> 
> > On Apr 25, 2014, at 14:38, Konstantin Boudnik <co...@apache.org> wrote:
> > 
> > Guys,
> > 
> > I have accidently pushed my local integration branch to our repo and messed up
> > the master a little bit. My The force-pushes are prohibited so I can't do quick
> > fix and will have to file INFRA ticket to move the master. 
> > 
> > The correct version of the master branch is right now on master.fixed, but it
> > might take some time for INFRA folks to make the move. So, please be patient
> > and do not commit anything to the messed up master yet.
> > 
> > Sorry about the mess ;(
> > -- 
> > Regards,
> >  Cos
> > 

Re: Accident on master branch

[Alejandro Abdelnur <tu...@cloudera.com>]

how about committing a revert and then asking infra to remove both commits, then nobody is stuck

Alejandro
(phone typing)

> On Apr 25, 2014, at 14:38, Konstantin Boudnik <co...@apache.org> wrote:
> 
> Guys,
> 
> I have accidently pushed my local integration branch to our repo and messed up
> the master a little bit. My The force-pushes are prohibited so I can't do quick
> fix and will have to file INFRA ticket to move the master. 
> 
> The correct version of the master branch is right now on master.fixed, but it
> might take some time for INFRA folks to make the move. So, please be patient
> and do not commit anything to the messed up master yet.
> 
> Sorry about the mess ;(
> -- 
> Regards,
>  Cos
>