Issue #1550 has been updated by pnasrat.
I was expecting this sort of workflow which works - my ticket branch is already rebased on top of your 0.24.x so I'm not sure you want to use rebase here. Surely it's just setup a branch pull my branch, then merge into 0.24.x It's definitely been rebased ontop of your 0.24.x branch: 1504a7c27fa07b8babb9d601a453959c8933b8d5 Bug #1550 - Rework to avoid regressing rspec tests, add new rspec tests for templatedir as a path 96b0d2db30deb7d6b8c8b145ca9ae7743dfc42e0 Allow a templatedir to be colon separated. 11b0848b8c6eaaded608f4a485990ddb5bbd5e80 Fixed #1500 - puppetrun host regression I've just tried to merge my changes onto a fresh clone of your repo: Paul-Nasrats-Computer:tmp pnasrat$ git clone git://github.com/jamtur01/puppet.git Initialized empty Git repository in /Users/pnasrat/tmp/puppet/.git/ remote: Counting objects: 38784, done. remote: Compressing objects: 100% (10753/10753), done. Indexing 38784 objects... remote: Total 38784 (delta 27495), reused 38672 (delta 27421) 100% (38784/38784) done Resolving 27495 deltas... 100% (27495/27495) done Checking 1529 files out... 100% (1529/1529) done Paul-Nasrats-Computer:tmp pnasrat$ cd puppet/ Paul-Nasrats-Computer:puppet pnasrat$ git remote -v origin git://github.com/jamtur01/puppet.git Paul-Nasrats-Computer:puppet pnasrat$ git fetch --tags Paul-Nasrats-Computer:puppet pnasrat$ git branch -r origin/0.24.x origin/HEAD origin/cc/0.24.x origin/master origin/tickets/0.24.x/1274 origin/tickets/1349 Paul-Nasrats-Computer:puppet pnasrat$ git checkout -b tickets/0.24.x/1550 origin/0.24.x Branch tickets/0.24.x/1550 set up to track remote branch refs/remotes/origin/0.24.x. Switched to a new branch "tickets/0.24.x/1550" Paul-Nasrats-Computer:puppet pnasrat$ git pull git://github.com/pnasrat/puppet.git tickets/0.24.x/1550 remote: Counting objects: 20, done. remote: Compressing objects: 100% (13/13), done. remote: Total 13 (delta 9), reused 0 (delta 0) Unpacking 13 objects... 100% (13/13) done Updating 11b0848..1504a7c Fast forward lib/puppet/module.rb | 40 +++++++++++++++++++++++++++++----------- spec/unit/module.rb | 27 ++++++++++++++++++++++++--- 2 files changed, 53 insertions(+), 14 deletions(-) git checkout -b 0.24.x origin/0.24.x git merge tickets/0.24.x/1550 Updating 11b0848..1504a7c Fast forward lib/puppet/module.rb | 40 +++++++++++++++++++++++++++++----------- spec/unit/module.rb | 27 ++++++++++++++++++++++++--- 2 files changed, 53 insertions(+), 14 deletions(-) ---------------------------------------- Bug #1550: should be able to specify multiple template directories http://projects.reductivelabs.com/issues/show/1550 Author: thom Status: Code Insufficient Priority: Normal Assigned to: pnasrat Category: newfeature Target version: 0.24.6 Complexity: Unknown Affected version: 0.24.4 Keywords: In much the same way as one can specify multiple module directories, it would be very useful to specify multiple paths to search for templates. ---------------------------------------- You have received this notification because you have either subscribed to it, or are involved in it. To change your notification preferences, please click here: http://reductivelabs.com/redmine/my/account --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Bugs" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/puppet-bugs?hl=en -~----------~----~----~----~------~----~------~--~---
