Mailing-List: contact common-dev-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: common-dev@hadoop.apache.org
MIME-Version: 1.0
In-Reply-To: <81A53BC1-EE9E-436E-AF01-91F69A4B362F@apache.org>
References: <1526F5E0-1773-49A9-80F5-31BE59F28770@apache.org>
	<CALwhT97-uXnqx5qtJgNqzsDa7K_fU6=zA2i9n3viABxdvTML5w@mail.gmail.com>
	<81A53BC1-EE9E-436E-AF01-91F69A4B362F@apache.org>
Date: Wed, 27 Jan 2016 16:40:02 -0800
Message-ID: 
 <CALwhT94geaf0RFkaMBVddpo3mCSrxn0Kr4j-CBOCC+QodiFXQA@mail.gmail.com>
Subject: Re: [UPDATE] New ASF git policy on force-pushes / Tags / Stale
 branches
From: Karthik Kambatla <kasha@cloudera.com>
To: "common-dev@hadoop.apache.org" <common-dev@hadoop.apache.org>
Cc: "yarn-dev@hadoop.apache.org" <yarn-dev@hadoop.apache.org>,
	"hdfs-dev@hadoop.apache.org" <hdfs-dev@hadoop.apache.org>,
	"mapreduce-dev@hadoop.apache.org" <mapreduce-dev@hadoop.apache.org>
Content-Type: multipart/alternative; boundary=001a114f1006b83157052a5a2899

--001a114f1006b83157052a5a2899
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Filed https://issues.apache.org/jira/browse/INFRA-11136

On Mon, Jan 25, 2016 at 3:41 PM, Vinod Kumar Vavilapalli <vinodkv@apache.or=
g
> wrote:

> I believe this is still in place, though I am not sure how we can verify
> this (without doing a force-push of course)
>
> +Vinod
>
> > One thing that wasn't clear from the INFRA announcement: are trunk,
> > branch-* branches protected against force-pushes in the new world? If
> not,
> > should we ask them to be locked up?
> >
> > Thanks
> > Karthik
> >
> > On Thu, Jan 14, 2016 at 10:26 PM, Vinod Kumar Vavilapalli <
> > vinodkv@apache.org> wrote:
> >
> >> Hi all,
> >>
> >> As some of you have noticed, we have an update from ASF infra on git
> >> branching policy: We no longer have a ASF wide mandate on disallowing
> >> force-pushes on all branches / tags.
> >>
> >> Summarizing information from the INFRA email for the sake of clarity i=
n
> >> the midst of recent confusion
> >> - We now can do force pushes, and branch/tag deletion on any branch or
> >> tag except refs/tags/rel
> >> - Any force pushes will be annotated in the commit-email as =E2=80=9C[=
Forced
> >> Update!]=E2=80=9D for the community to watch out for undesired force-p=
ushes
> >> - Only tags under refs/tags/rel are protected from force-push for the
> >> sake of release-provenance: Essentially, the releases that community
> votes
> >> on are archived in their entirety with the development history and we
> >> cannot alter that once a tag is created. As one might expect.
> >>
> >> What this means for us
> >> - Stale branches: There are a few stale branches that got accumulated.
> >>    =E2=80=94 During this branch moratorium, origin/bracnh-2.8 got crea=
ted (May
> be
> >> as part of HDFS-8785, can=E2=80=99t say for sure)
> >>    =E2=80=94 A couple of stale branches that helped 2.6.1 release:
> >> origin/sjlee/hdfs-merge and origin/ajisakaa/common-merge
> >>    =E2=80=94 I=E2=80=99ll wait till EOD tomorrow for any yays/nays and=
 delete them
> >> - Feature branch updates: Developers can now go rebase and force-push
> >> their feature branches.
> >> - Mainline branches: Mainline branches like trunk, branch-2 have alway=
s
> >> been configured to avoid force-pushes. In general, force-push continue=
s
> to
> >> be recommended mainly for feature branches and definitely not on any
> >> mainline branches from which we make releases.
> >> - Release tags:
> >>    =E2=80=94 To follow ASF provenance policy, we will now push the fin=
al release
> >> tags under refs/tags/rel. We will first push the RC tags under where
> they
> >> reside now (refs/tags) and if the vote passes, the final tag will be
> >> created under refs/tags/rel.
> >>    =E2=80=94 I=E2=80=99ll update our release wiki page
> >> http://wiki.apache.org/hadoop/HowToRelease <
> >> http://wiki.apache.org/hadoop/HowToRelease> with the same details once
> I
> >> can get 2.7.2 release done using this updated process.
> >> - Existing release tags:
> >>    =E2=80=94 There is a general recommendation from INFRA team to take=
 all of
> our
> >> existing release tags under "tags" and copy them to =E2=80=9Crel=E2=80=
=9D.
> >>    =E2=80=94 I=E2=80=99ll wait till EOD tomorrow for any yays/nays and=
 copy existing
> >> releases under refs/tags/rel following general recommendations.
> >>
> >> Any comments / thoughts / questions welcome.
> >>
> >> Thanks
> >> +Vinod
>
>

--001a114f1006b83157052a5a2899--