Perhaps you can make the changes directly on the wiki page as a duplicate line item under the original in a different color? It's hard for me to really follow, esp as it's not a 1:1 replacement iiuc. Could you try editing the wiki directly to start with, leave the original line and add the new line(s) but in another color or some other indication?
Thanks Rakesh. Patrick On Mon, Jan 16, 2017 at 8:48 AM, Rakesh Radhakrishnan <rake...@apache.org> wrote: > Hi folks, > > As we all know, 3.4.10 release is the first ZooKeeper release after the > github repository migration. I have tried an attempt to modify the steps > described in the ' > https://cwiki.apache.org/confluence/display/ZOOKEEPER/HowToRelease' page > to > make the release. Since this release is from an already created branch, I > have focused only the branch related parts in cwiki and below sections in > the page needed changes like, > > > *Updating the release branch* > 1. Check out the branch with: > git clone -b branch-X.Y > https://git-wip-us.apache.org/repos/asf/zookeeper.git > > 2. I'm skipping this step, which is not required now. > > 4. Update CHANGES.txt with the committed jira details. As we follow PR > merging, most of the jira info is not updated in this file. I believe > release manager need to update this file to capture the jira details marked > for that release. > > 10. Commit these changes. > git commit -a -m "Preparing for release X.Y.Z" > git push <remote> <branch> > > 11. Tag the release candidate (R is the release candidate number, and > starts from 0): > git tag -s release-X.Y.Z-rcR -m "ZooKeeper X.Y.Z-rcR release." > > Push the newly created rc tag to the remote repo. > git push <remote> release-X.Y.Z-rcR > > > *Building* > 9. Call for a release vote on dev > In the release candidate dev mail format, it needs to change the > tag like, > > "The RC tag in git to be voted upon: release-X.Y.Z-rcR" > > > *Publishing* > 1. Tag the release: > git tag -s release-X.Y.Z -m "ZooKeeper X.Y.Z release." > > Push the newly created release tag to the remote repo. > git push <remote> release-X.Y.Z > > > I'd like to know whether I'm going in the right direction and start cutting > the 3.4.10 release by following this approach. Thanks! > > Thanks, > Rakesh > > On Mon, Jan 16, 2017 at 11:09 AM, Rakesh Radhakrishnan <rake...@apache.org > > > wrote: > > > Thanks for pointing this jira. I will take a look at this. > > > > Rakesh > > > > On Fri, Jan 13, 2017 at 7:27 PM, Edward Ribeiro < > edward.ribe...@gmail.com> > > wrote: > > > >> Hi Rakesh, > >> > >> Thansk for stepping up to this task! Pretty cool! :) > >> > >> Do you think https://issues.apache.org/jira/browse/ZOOKEEPER-2573 is > >> worth > >> targeting 3.4.10 too? > >> > >> Edward > >> > >> > >> > >> On Fri, Jan 13, 2017 at 7:56 AM, Rakesh Radhakrishnan < > rake...@apache.org > >> > > >> wrote: > >> > >> > Hi All, > >> > > >> > I hope to cut an RC in a week - giving some more time for your > favorite > >> > outstanding blocker/critical issues. Will start moving out any tickets > >> that > >> > are not blockers and/or won’t fit the timeline - there are 1 blocker, > 5 > >> > critical, 15 major, 7 minor tickets outstanding as of now. Appreciate > >> your > >> > support in releasing 3.4.10 version. Thanks! > >> > > >> > Please find the open issues marked for 3.4.10 release here, > >> > https://goo.gl/XdraFA > >> > > >> > Thanks, > >> > Rakesh > >> > > >> > > >> > On Tue, Dec 6, 2016 at 4:15 PM, Rakesh Radhakrishnan < > >> rake...@apache.org> > >> > wrote: > >> > > >> > > Hi All, > >> > > > >> > > I am interested in going through the release process as the RM. > >> > > > >> > > Overall, I could see total 41 issues marked for 3.4.10 release as of > >> now, > >> > > which includes 4 blockers, 5 critical, 20 major and 12 minor > issues. I > >> > > count 9 issues fixed/committed already for 3.4.10 which includes 1 > >> > blocker > >> > > and 1 critical(security related) issue. ZOOKEEPER-1045 is a much > >> awaited > >> > > one and the feature code is committed. I think it is a good time to > >> > > initiate the discussion of 3.4.10 release processes. > >> > > > >> > > Please find the issues marked for 3.4.10 release here, > >> > > https://goo.gl/FfbpVG > >> > > > >> > > Currently, I'm focusing on updating ZOOKEEPER-1045 feature details > >> into > >> > > our project cwiki and related ZOOKEEPER-2479 improvement jira. I'd > >> like > >> > to > >> > > include ZOOKEEPER-2383 into this release if everyone agrees. > >> Appreciate > >> > > your help in reviewing the jira patches and making it stable for > >> release. > >> > > Also, please feel free to push your favorite issues ahead of 3.4.10 > >> > release. > >> > > > >> > > I hope with the community support, we should be able to close all > >> > > necessary blockers/critical issues soon. Kindly requesting everyone > to > >> > look > >> > > at the issues marked for 3.4.10 and push these asap or can be pushed > >> out > >> > to > >> > > 3.4.11. > >> > > > >> > > Imp: Since we moved to github repository, the release procedure > >> > > https://cwiki.apache.org/confluence/display/ZOOKEEPER/HowToRelease > >> > > requires changes. Appreciate your help in this part. Thanks! > >> > > > >> > > Please let me know your thoughts on the plan. > >> > > > >> > > Thanks, > >> > > Rakesh > >> > > > >> > > >> > > > > >
