Jira (PDB-3572) Merge master into stable (PDB 5.0.0)

2017-06-27 Thread Rob Browning (JIRA)
Title: Message Title
 
 
 
 
 
 
 
 
 
 
  
 
 Rob Browning updated an issue 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
 
 
 
 PuppetDB /  PDB-3572 
 
 
 
  Merge master into stable (PDB 5.0.0)  
 
 
 
 
 
 
 
 
 

Change By:
 
 Rob Browning 
 
 
 

Fix Version/s:
 
 PDB 5.0.0 
 
 
 
 
 
 
 
 
 
 
 
 

 
 Add Comment 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
 
 
 
 
 
 

 This message was sent by Atlassian JIRA (v6.4.14#64029-sha1:ae256fe) 
 
 
 
 
  
 
 
 
 
 
 
 
 
   





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


Jira (PDB-3572) Merge master into stable (PDB 5.0.0)

2017-06-27 Thread Rob Browning (JIRA)
Title: Message Title
 
 
 
 
 
 
 
 
 
 
  
 
 Rob Browning updated an issue 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
 
 
 
 PuppetDB /  PDB-3572 
 
 
 
  Merge master into stable (PDB 5.0.0)  
 
 
 
 
 
 
 
 
 

Change By:
 
 Rob Browning 
 
 
 

Release Notes:
 
 Not Needed 
 
 
 
 
 
 
 
 
 
 
 
 

 
 Add Comment 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
 
 
 
 
 
 

 This message was sent by Atlassian JIRA (v6.4.14#64029-sha1:ae256fe) 
 
 
 
 
  
 
 
 
 
 
 
 
 
   





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


Jira (PDB-3572) Merge master into stable (PDB 5.0.0)

2017-06-20 Thread Rob Browning (JIRA)
Title: Message Title
 
 
 
 
 
 
 
 
 
 
  
 
 Rob Browning created an issue 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
 
 
 
 PuppetDB /  PDB-3572 
 
 
 
  Merge master into stable (PDB 5.0.0)  
 
 
 
 
 
 
 
 
 

Issue Type:
 
  Sub-task 
 
 
 

Assignee:
 
 Rob Browning 
 
 
 

Created:
 

 2017/06/20 11:00 AM 
 
 
 

Priority:
 
  Normal 
 
 
 

Reporter:
 
 Rob Browning 
 
 
 
 
 
 
 
 
 
 
(Initial planned release date: 2017-06-27) 
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