Jira (PUP-3413) Merge master into stable

[Rob Reynolds (JIRA)]

Title: Message Title

Rob Reynolds commented on an issue   Re: Merge master into stable Nope. Add Comment   Puppet / PUP-3413 Merge master into stable 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: {noformat} git fetch upstre... This message was sent by Atlassian JIRA (v6.1.4#6159-sha1:44eaede) -- 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 http://groups.google.com/group/puppet-bugs. For more options, visit https://groups.google.com/d/optout.