Does this mean features havent been merged into master will be postponed to 4.2?
-Mice 2013/2/2 Alex Huang <alex.hu...@citrix.com>: > Kelven also mentioned he had to merge a few times because code was being > changed in master. It is supposed to be frozen until this message from Chip. > Please respect the instructions the release manager has given out. Master > is now open but 4.1 is now frozen. Please respect this even though you can > check-in to 4.1. If we find "features" being sneaked in, then it would make > sense for us to lockdown 4.1, which makes bug fixing and unit testing > checkins a laborious process. > > --Alex > >> -----Original Message----- >> From: Chip Childers [mailto:chip.child...@sungard.com] >> Sent: Friday, February 01, 2013 5:58 PM >> To: cloudstack-dev@incubator.apache.org >> Subject: [ACS41] 4.1 branch created >> >> Hi all, >> >> Looks like Kelvin finished the merge of javelin into master, so I went >> ahead and branched master for the 4.1 release (after mistakenly doing >> the same for 4.2... jumping the gun by a few months ;-) ) >> >> This isn't a "locked down" branch right now, but I'd ask committers to >> respect the feature and improvement freeze in that branch. Bug fixes, >> doc updates and other release stabilization activities are obviously >> expected. Committers should feel free to commit directly into that >> branch until we hit the code freeze date). >> >> For non-commiter contributors, it might be best to actually send in >> patches that have been built against the 4.1 branch. Committers >> taking these fixes should also consider applying them to master. If >> there are conflicts in master (which may happen, as there were a >> couple of code-base refactoring activities, like switching packages >> from com.cloud to org.apache.cloudstack), apply the fix into 4.1 >> anyway, and inform the submitter that the patch has conflicts with >> master to get that sorted out (or you can fix it yourself). >> >> Shout if you have questions / concerns / flames. >> >> -chip
