Jira (PUP-5667) Merge master into stable (PUP 3.8.5)

[Kylo Ginsberg (JIRA)]

Title: Message Title

Kylo Ginsberg created an issue   Puppet / PUP-5667 Merge master into stable (PUP 3.8.5) Issue Type: Sub-task Assignee: Henrik Lindberg Created: 2016/01/07 11:40 PM Priority: Normal Reporter: Kylo Ginsberg (Initial planned release date: 2016-01-13) 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? Reconcile git commits and JIRA tickets Update version number in source Add Comment   This message was sent by Atlassian JIRA (v6.4.12#64027-sha1:e3691cc) -- You received this message because you are subscribed to the Google Groups "Puppet Bugs" group. To unsubscribe from this group and stop receiving emails from it, send an email to puppet-bugs+unsubscr...@googlegroups.com. To post to this group, send email to puppet-bugs@googlegroups.com. Visit this group at https://groups.google.com/group/puppet-bugs. For more options, visit https://groups.google.com/d/optout.