+1 for removing the branch-3 branch. It should be done soon so more confusion can be avoided. Thanks Jason for tracking this down. -Eric
From: Jason Lowe <jl...@apache.org> To: Hadoop Common <common-dev@hadoop.apache.org>; ma...@cloudera.com Sent: Wednesday, January 17, 2018 12:42 PM Subject: Re: What's the difference between branch-3 and branch-3.0? This was created accidentally when HDFS-11847 was committed. As such we should delete the branch-3 branch and port over the commits that went into branch-3 instead of branch-3.0. For the former, I'm assuming that requires an INFRA ticket since I would hope any committer would not have the ability to destroy a branch-* branch. Unfortunately even after it's deleted I suspect we will see it reappear if someone pushes up their old copy of branch-3 again, so committers will need to be vigilant. I'll work on porting the missing changes below from branch-3 over to branch-3.0. I'll wait for some more consensus on the branch-3 deletion before filing the INFRA ticket since deleting a branch shouldn't be done lightly. Jason commit 0802d8afa355d9a0683fdb2e9c4963e8fea8644f Author: Vinayakumar B <vinayakum...@apache.org> Date: Wed Jan 17 14:16:48 2018 +0530 HDFS-9049. Make Datanode Netty reverse proxy port to be configurable. Contributed by Vinayakumar B. (cherry picked from commit 09efdfe9e13c9695867ce4034aa6ec970c2032f1) commit db8345fa9cd124728d935f725525e2626438b4c1 Author: Lei Xu <l...@apache.org> Date: Tue Jan 16 15:15:11 2018 -0800 HDFS-13004. TestLeaseRecoveryStriped.testLeaseRecovery is failing when safeLength is 0MB or larger than the test file. (Zsolt Venczel via lei) (cherry picked from commit 3bd9ea63df769345a9d02a404cfb61323a4cd7e3) commit 82741091a78d7ce62c240ec3e7f81a3a9a3fee36 Author: Inigo Goiri <inigo...@apache.org> Date: Mon Jan 15 12:21:24 2018 -0800 HDFS-12919. RBF: Support erasure coding methods in RouterRpcServer. Contributed by Inigo Goiri. commit d3fbcd92fe53192a319683b9ac72179cb28bd978 Author: Yiqun Lin <yq...@apache.org> Date: Sat Jan 6 14:31:08 2018 +0800 HDFS-11848. Enhance dfsadmin listOpenFiles command to list files under a given path. Contributed by Yiqun Lin. commit ee44783515a55ab9fd368660c5cc2c2bc392132e Author: Manoj Govindassamy <manoj...@apache.org> Date: Tue Jan 2 14:59:36 2018 -0800 HDFS-11847. Enhance dfsadmin listOpenFiles command to list files blocking datanode decommissioning. On Wed, Jan 17, 2018 at 10:53 AM, Brahma Reddy Battula <bra...@apache.org> wrote: > IMHO,we no need to have *branch-3* still trunk moves.Shall we remove as it > make confuses.?? > > > > > Brahma Reddy Battula > > On Wed, Jan 17, 2018 at 9:41 PM, Jason Lowe <jl...@oath.com.invalid> > wrote: > > > I recently noticed some committers posting commits to branch-3 and > marking > > the JIRA as fixed in 3.0.1. I thought branch-3.0 was tracking 3.0.x > > releases, including branch-3.0.1 as of now, so I am confused what > branch-3 > > is for. The versions in the poms between branch-3 and branch-3.0 both > say > > they are 3.0.1-SNAPSHOT. > > > > I recall we discussed _not_ creating branch-3 until it is necessary, and > it > > is only necessary for branch-3 to exist when trunk stop tracking 3.x > > releases (i.e.: when trunk moves to 4.0.0-SNAPSHOT). > > > > Jason > > > > > > -- > > > > --Brahma Reddy Battula >