Hugo can talk about this in more depth, but the idea is that you develop your feature in your own branch (every now and then rebasing your work on top of what's been put into master to keep it current).
At some point, there is what we call Feature Freeze (that was last week Friday). On this day (ideally beforehand, if reasonably possible), all new features must be taken from your branch and put into the master branch. At some point in the day, a new branch - in this case, called 4.4 - is made and then master is used for the release to follow 4.4. After Feature Freeze, all changes to 4.4 should be accompanied by a JIRA ticket (ideally this would always be the case) and most of our 4.4 effort is placed into testing what we have versus adding new features to it. On Wed, Mar 19, 2014 at 10:44 PM, Pradeep Cloudstack < pradeepcloudst...@yahoo.com> wrote: > Hi Sudha,Mike,Hogo, > this is a new feature (and I am also new to the process) > So I am not quite getting the meaning of "All merges are done last week". > > -Pradeep > > > > > ________________________________ > From: Sudha Ponnaganti <sudha.ponnaga...@citrix.com> > To: "dev@cloudstack.apache.org" <dev@cloudstack.apache.org>; Pradeep > Cloudstack <pradeepcloudst...@yahoo.com>; Chiradeep Vittal < > chiradeep.vit...@citrix.com>; Animesh Chaturvedi < > animesh.chaturv...@citrix.com> > Sent: Thursday, March 20, 2014 10:04 AM > Subject: RE: 4.4 Feature Freeze > > > It is too late already - All merges are done last week. It can go in to > 4.5 (Master) > > > -----Original Message----- > From: Pradeep Cloudstack [mailto:pradeepcloudst...@yahoo.com] > Sent: Wednesday, March 19, 2014 9:30 PM > To: dev@cloudstack.apache.org; Chiradeep Vittal; Animesh Chaturvedi > Subject: Re: 4.4 Feature Freeze > > Hi Mike, > the following feature > https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36274178 > is there under 4.4 Design documents. > > How do I check if this feature is part of 4.4 ? > > I had sent out a Proposal sometime back about this feature > > -Pradeep > > > > > ________________________________ > From: Mike Tutkowski <mike.tutkow...@solidfire.com> > To: "dev@cloudstack.apache.org" <dev@cloudstack.apache.org>; Pradeep > Cloudstack <pradeepcloudst...@yahoo.com> > Sent: Thursday, March 20, 2014 9:52 AM > Subject: Re: 4.4 Feature Freeze > > > I'm not sure if we have a "code freeze" per se, but "feature freeze" was > last week Friday. Technically all features that are to go into 4.4 should > have been in master on that day when the 4.4 branch was cut. > > > On Wed, Mar 19, 2014 at 10:01 PM, Pradeep Cloudstack < > pradeepcloudst...@yahoo.com> wrote: > > > What is the code-freeze date for 4.4 ? > > I need to commit the following feature - > > > > > https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36274178 > > > > > > -Pradeep > > > > > > > > > > > > On Friday, March 14, 2014 8:13 PM, Sudha Ponnaganti < > > sudha.ponnaga...@citrix.com> wrote: > > > > Other alternative is to block further check-ins till blocking issue is > > fixed. As long as BVTs are good then it can be opened up for further > check > > ins. Just a suggestion. > > > > > > -----Original Message----- > > From: Marcus [mailto:shadow...@gmail.com] > > Sent: Friday, March 14, 2014 7:40 AM > > To: dev@cloudstack.apache.org > > Subject: Re: 4.4 Feature Freeze > > > > It may even just be a behavioral change or something simple I missed that > > is now required with a recent check-in. Obviously I don't feel > comfortable > > merging in my feature branch though when I pull from master and can no > > longer run my own feature tests. > > > > On Fri, Mar 14, 2014 at 8:35 AM, Marcus <shadow...@gmail.com> wrote: > > > I'm not sure what the offending ones are at the moment, and there was > > > recently a feature merge that was not squashed, so it might be a > > > little difficult to weed through. > > > > > > On Mar 14, 2014 7:45 AM, "Sudha Ponnaganti" > > > <sudha.ponnaga...@citrix.com> > > > wrote: > > >> > > >> Can the offending check-ins be reverted or master be blocked for > > >> further check-ins till blocking issue is fixed. > > >> Talluri is running BVTs and can that be taken as basic passing > > >> criteria to re-enable check-ins. > > >> > > >> -----Original Message----- > > >> From: Marcus [mailto:shadow...@gmail.com] > > >> Sent: Friday, March 14, 2014 6:36 AM > > >> To: dev@cloudstack.apache.org > > >> Subject: Re: 4.4 Feature Freeze > > >> > > >> Will be doing it today, however it seems that there have been some > > >> new issues that have cropped up in master that break basic > > functionality. > > >> I'm not sure if anyone should merge or not while that is the case. I > > >> was attempting to validate that the latest merges played well in my > > >> branch, but I couldn't even get a vm running with the current master, > > >> and I see that while I was sleeping others have reported some of the > > >> issues I was seeing as well. > > >> > > >> On Fri, Mar 14, 2014 at 3:43 AM, Nux! <n...@li.nux.ro> wrote: > > >> > On 11.03.2014 15:28, Hugo Trippaers wrote: > > >> >> > > >> >> Hey guys, > > >> >> > > >> >> I didn't go and tally all the +1s and -1s for the shift of the > > >> >> feature freeze, but with so many reactions i feel sticking to the > > >> >> schedule is the only way to go. We should only change dates if > > >> >> there is a consensus and there clearly is none at the moment. > > >> >> Let's take this discussion to the 4.5 release if we need to or > > >> >> focus on doing a high quality release for 4.4 so we can focus on > > >> >> features again in 4.4 > > >> >> > > >> >> This means that the feature freeze would be this friday and i > > >> >> intend to cut the 4.4 branch around 14:00 CET > > >> >> > > >> >> As we have a 72 hour window for MERGE requests, please make sure > > >> >> they are in today (if the feature is ready). > > >> >> > > >> >> > > >> >> Cheers, > > >> >> > > >> >> Hugo > > >> > > > >> > > > >> > Can someone confirm if this has made it in? > > >> > https://issues.apache.org/jira/browse/CLOUDSTACK-6181 > > >> > > > >> > Marcus requested the MERGE a couple of days ago. > > >> > http://www.mail-archive.com/dev@cloudstack.apache.org/msg24793.html > > >> > > > >> > Lucian > > >> > > > >> > -- > > >> > Sent from the Delta quadrant using Borg technology! > > >> > > > >> > Nux! > > >> > www.nux.ro > > > > > > -- > *Mike Tutkowski* > *Senior CloudStack Developer, SolidFire Inc.* > e: mike.tutkow...@solidfire.com > o: 303.746.7302 > Advancing the way the world uses the > cloud<http://solidfire.com/solution/overview/?video=play> > > *(tm)* > -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfire.com o: 303.746.7302 Advancing the way the world uses the cloud<http://solidfire.com/solution/overview/?video=play> *(tm)*
