puppet 4.0.0 2015-04-01 Release (PUP-4292)

[PUP-4297] Merge master into stable Created: 2015/03/25  Updated: 2015/04/06  Resolved: 2015/04/06

Status: Closed
Project: Puppet
Component/s: None
Affects Version/s: None
Fix Version/s: None

Type: Sub-task Priority: Normal
Reporter: Kylo Ginsberg Assignee: Kylo Ginsberg
Resolution: Won't Fix Votes: 0
Labels: None
Remaining Estimate: Not Specified
Time Spent: Not Specified
Original Estimate: Not Specified

Template:
Sprint: Client 2015-04-15

 Description   

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:

git fetch upstream
git rebase upstream/master
 
git checkout stable
git rebase upstream/stable
 
git merge master --no-ff --log

Once that looks good:

git push origin
git push upstream

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.

Dependencies:

  • Is the code ready for release?
  • Is there a commit for every JIRA ticket targeted at the release?
  • Update version number in source


 Comments   
Comment by Kylo Ginsberg [ 2015/04/06 ]

N/A. This happened earlier.

Generated at Mon Dec 16 02:21:50 PST 2019 using JIRA 7.7.1#77002-sha1:e75ca93d5574d9409c0630b81c894d9065296414.