puppet 4.0.0 2015-04-01 Release
[PUP-4297] Merge master into stable Created: 2015/03/25 Updated: 2015/04/06 Resolved: 2015/04/06
|Reporter:||Kylo Ginsberg||Assignee:||Kylo Ginsberg|
|Remaining Estimate:||Not Specified|
|Time Spent:||Not Specified|
|Original Estimate:||Not Specified|
For some releases, the code base will need to be merged down to stable.
NOTE: This is usually only during a x.y.0 release, but even then it may have already been done. If it doesn't apply, close this ticket.
Assuming you have origin (your remote) and upstream (puppetlabs remote), the commands will look something like this:
Once that looks good:
After merging to stable, the jobs on jenkins may require updates (spec, acceptance, etc) when you merge master into stable. Please ensure that the jenkins jobs are updated if necessary.
|Comment by Kylo Ginsberg [ 2015/04/06 ]|
N/A. This happened earlier.