Jira (PUP-4834) Merge master into stable

2015-07-21 Thread Kylo Ginsberg (JIRA) 
Title: Message Title
 
 
 
 
 
 
 
 
 
 
  
 
 Kylo Ginsberg commented on  PUP-4834 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
 
 
 
  Re: Merge master into stable  
 
 
 
 
 
 
 
 
 
 
Doesn't apply to a Z release. 
 
 
 
 
 
 
 
 
 
 
 
 

 
 Add Comment 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
 
 
 
 
 
 

 This message was sent by Atlassian JIRA (v6.4.5#64020-sha1:78acd6c) 
 
 
 
 
  
 
 
 
 
 
 
 
 
   





-- 
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.

Jira (PUP-4834) Merge master into stable

2015-07-08 Thread Kylo Ginsberg (JIRA) 
Title: Message Title
 
 
 
 
 
 
 
 
 
 
  
 
 Kylo Ginsberg created an issue 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
 
 
 
 Puppet /  PUP-4834 
 
 
 
  Merge master into stable  
 
 
 
 
 
 
 
 
 

Issue Type:
 
  Sub-task 
 
 
 

Assignee:
 
 Kylo Ginsberg 
 
 
 

Created:
 

 2015/07/08 8:54 AM 
 
 
 

Priority:
 
  Normal 
 
 
 

Reporter:
 
 Kylo Ginsberg 
 
 
 
 
 
 
 
 
 
 
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