diff options
| author | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-18 15:45:19 -0700 |
|---|---|---|
| committer | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-18 15:45:19 -0700 |
| commit | a622c95776d008c7aee64b553bdf127c86caed6f (patch) | |
| tree | c0525cb08e6c271b18b1275ecdea8bac5af5ca5d /lib | |
| parent | 3378841a230cb467173eed9ed5d3aaa6cd08b2fc (diff) | |
| parent | 83c756367ef4bfc404b2395362f796c2c942b053 (diff) | |
| download | puppet-a622c95776d008c7aee64b553bdf127c86caed6f.tar.gz puppet-a622c95776d008c7aee64b553bdf127c86caed6f.tar.xz puppet-a622c95776d008c7aee64b553bdf127c86caed6f.zip | |
Merge branch 'tickets/2.7.x/7259' into 2.7.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/indirector.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/indirector.rb b/lib/puppet/indirector.rb index 7267ac7f3..86ede5994 100644 --- a/lib/puppet/indirector.rb +++ b/lib/puppet/indirector.rb @@ -18,7 +18,7 @@ module Puppet::Indirector terminus_name = termini["terminus"] cache_name = termini["cache"] - Puppet::Indirector::Terminus.terminus_classes(indirection_name) + Puppet::Indirector::Terminus.terminus_class(indirection_name, terminus_name || cache_name) indirection = Puppet::Indirector::Indirection.instance(indirection_name) raise "Indirection #{indirection_name} does not exist" unless indirection |