I've gone over the source tree and I think I've made all the changes for CS4 version numbers…I'm going to do some QA today and will check that in later this afternoon (would be nice if new Jira was up so we could document the version number changes against a bug, will see how timing works)
The one place I don't want to make changes is in the docs. The files below mention 3.0, could the doc writers review and consider updates? setup/apidoc/generateadmincommands.xsl setup/apidoc/generatetoc_header.xsl setup/apidoc/generateusercommands.xsl docs/en-US/api-reference.xml docs/en-US/asynchronous-commands-example.xml docs/en-US/cloudstack_features.xml docs/en-US/compatibility-matrix.xml docs/en-US/enabling-port-8096.xml docs/en-US/feature-overview.xml docs/en-US/release-notes-3.0.4.xml (I guess we need release-notes-4.0.0.xml?) docs/en-US/using-netscaler-load-balancers.xml docs/en-US/whats-new.xml docs/runbook/en-US/Book_Info.xml docs/runbook/en-US/Management.xml docs/runbook/en-US/Overview.xml docs/runbook/zh-CN/Management.po docs/runbook/zh-CN/Management.po John On Aug 13, 2012, at 7:59 PM, Chip Childers <chip.child...@sungard.com<mailto:chip.child...@sungard.com>> wrote: On Aug 13, 2012, at 10:26 PM, Alex Huang <alex.hu...@citrix.com<mailto:alex.hu...@citrix.com>> wrote: Alex - What sort of merge schedule do you think you'll aim for? Daily? Ongoing through the workday? What sort of indication do you want when we know something should go into 4.0? I'm new to this so I'm open to suggestions. I'll start with daily because it's easier for me to do this at a set time every day. I would suggest everyone to use the same tag as the mailing list, [ASFCS40], in their checkin as a special notification to me that it must be added to 4.0 branch. In addition, it seems to me Ewan is suggesting that everyone should be careful with checkin to master which means we might reject patches that is not needed by 4.0 and I'll just work on pulling everything from master. Let me know if that's not right. --Alex We're all new at this... ;) I think your approach makes sense. -chip Stratosec<http://stratosec.co> - Secure Infrastructure as a Service o: 415.315.9385 @johnlkinsella<http://twitter.com/johnlkinsella>
