<html><body>
<p><font size="2" face="sans-serif">I suppose that implies Jenkins jobs that are supposed to be testing the bleeding edge need to be altered to pull from master-next as well. <br>
<br>
Nick Bofferding <br>
POWER Firmware Development | Dept OFKA<br>
bofferdn@us.ibm.com | 045-2A-010<br>
External: (512) 286-5389, ITN: 23635389<br>
Tie Line: 363-5389, Austin Site: 3-5389</font><br>
<br>
<img width="16" height="16" src="cid:1__=09BBF493DFDD7E3C8f9e8a93df938@us.ibm.com" border="0" alt="Inactive hide details for Patrick Williams III---03/06/2015 03:24:47 AM---With the release of op-build v1.0, I created a new br"><font size="2" color="#424282" face="sans-serif">Patrick Williams III---03/06/2015 03:24:47 AM---With the release of op-build v1.0, I created a new branch to prepare for v1.1 called 'master-next'.</font><br>
<br>
<font size="1" color="#5F5F5F" face="sans-serif">From: </font><font size="1" face="sans-serif">Patrick Williams III/Rochester/IBM</font><br>
<font size="1" color="#5F5F5F" face="sans-serif">To: </font><font size="1" face="sans-serif">HOSTBOOT-PFD-ALL, skiboot@lists.ozlabs.org</font><br>
<font size="1" color="#5F5F5F" face="sans-serif">Date: </font><font size="1" face="sans-serif">03/06/2015 03:24 AM</font><br>
<font size="1" color="#5F5F5F" face="sans-serif">Subject: </font><font size="1" face="sans-serif">op-build: new branch master-next</font><br>
<hr width="100%" size="2" align="left" noshade style="color:#8091A5; "><br>
<br>
<br>
<tt><font size="2">With the release of op-build v1.0, I created a new branch to prepare for v1.1 called 'master-next'. This allows us to easily make v1.0.x releases on top of v1.0 to fix critical problems until v1.1 is released without having to create and manage a branch for every release.<br>
<br>
My intention is that master-next can always be seen as the "release candidate" for the next op-build release. In order to accomplish this, all pull requests for new functionality should go against the master-next branch. Only critical fixes for an existing release, such as v1.0, should go into master.<br>
<br>
We should be doing additional releases on a fairly regular cadence for the foreseeable future. I suspect this will be somewhere between 2 weeks and a month. Near the point of release, we will take everything from 'master-next' and merge it into 'master' and create a tag on 'master' for the next release. I say 'near' because I haven't decided if we will create formal -rc tags and if they should be on master or master-next. If you have an opinion, please let me know.<br>
<br>
Patrick Williams<br>
Power Firmware Development, <br>
Bldg 045-2/C034<br>
512-286-6369, T/L: 363-6369<br>
iawillia@us.ibm.com<br>
</font></tt><br>
</body></html>