I went ahead and committed a couple of changes to trunk and branch-2 to fix the MR CHANGES.txt mess. Alexandro, I believe there's a couple of jiras where you were waiting for CHANGES.txt fixes before merging to branch-2. Not sure about past discussions, but can we re-visit removing CHANGES.txt in favour of jira fix versions.
While we maintain this file, a couple of points to prevent this ... - For changes that go into 0.23, the CHANGES.txt entry needs to be included under the 2.x line as well since 2.x and 0.23 are on a different release schedule. - When merging into a branch, please update CHANGES.txt on the src branch as well. trunk was out of sync on a lot of CHANGES which have gone into 2.0.5. - Something going wrong with these files isn't always discovered immediately, but adds up fast - so a little extra caution with changes, merge-conflicts etc on these files... There's jiras like MAPREDUCE-4790, for which the fix version on jira is trunk-win, but the patch is already in trunk. Does fix version trunk-win imply the patch is in trunk as well ? Thanks - Sid On Wed, Apr 3, 2013 at 3:02 PM, Vinod Kumar Vavilapalli < vino...@hortonworks.com> wrote: > I started looking at this yesterday, MAPREDUCE CHANGES.txt is completely > broken. I'll try to fix it and then send out a note once I am done. > > Thanks, > +Vinod > > On Apr 1, 2013, at 11:46 PM, Vinod Kumar Vavilapalli wrote: > > > > > I've been looking at YARN and it seems to be fine. I presume common and > hdfs too. > > > > MR clearly has issues. Have to manually fix it. Will do something > tomorrow first thing. > > > > Thanks, > > +Vinod Kumar Vavilapalli > > > > On Apr 1, 2013, at 3:53 PM, Alejandro Abdelnur wrote: > > > >> while trying to commit MAPREDUCE-5113 to branch-2 I've noticed that the > >> CHANGES.txt are out of sync. Commit message are on the wrong releases. > >> > >> I've spent some some time trying to fix it, but I did not find it > straight > >> forward to do so. > >> > >> I assume the same may be true for common, hdfs and yarn. > >> > >> I know why we use CHANGES.txt files has been discussed in the past, so > I'll > >> not raise a suggestion to get rid of them. > >> > >> Does anybody has a simple list of steps to fix this ? > >> > >> Thx > >> > >> -- > >> Alejandro > > > >
