Jira (HI-245) Merge master into stable

[Kylo Ginsberg (JIRA)]

Title: Message Title

Kylo Ginsberg commented on an issue   Re: Merge master into stable @melissa here's the conflict Henrik Lindberg is referring to: <<<<<<< HEAD cows: 'base-lucid-i386.cow base-precise-i386.cow base-quantal-i386.cow base-raring-i386.cow base-saucy-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-trusty-i386.cow base-unstable-i386.cow base-wheezy-i386.cow' ======= cows: 'base-lucid-i386.cow base-precise-i386.cow base-quantal-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-trusty-i386.cow base-unstable-i386.cow base-wheezy-i386.cow base-saucy-i386.cow' >>>>>>> origin/stable Can you advise? Looks like there have been commits to both stable and master for the cows list, e.g. somehow saucy is in the middle of master's list but at the end of stable's list. If possible, going forward we should probably just target stable and then merge up. Add Comment   Hiera / HI-245 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 z-rc1 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.