diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-05-16 10:34:03 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-05-16 10:34:03 -0700 |
| commit | 2705a041f050a74cd7d11922c9b67ff747c1344f (patch) | |
| tree | 646284edb1fdd5b61f3f885250ea4c2204002079 /lib | |
| parent | 4b7afaa065383c4a441068a15f97ab82d2ebd3fc (diff) | |
| parent | c8775f9c5caa883ab3b08695b355d3575263b165 (diff) | |
| download | puppet-2705a041f050a74cd7d11922c9b67ff747c1344f.tar.gz puppet-2705a041f050a74cd7d11922c9b67ff747c1344f.tar.xz puppet-2705a041f050a74cd7d11922c9b67ff747c1344f.zip | |
Merge branch 'tickets/2.7.x/7259-make-active-record-test-requirement-optional' into 2.7.next
* tickets/2.7.x/7259-make-active-record-test-requirement-optional:
(#7259) Remove ActiveRecord requirement from indirector face spec
(#7259) Do not try to load all Terminus classes when configuring the Indirector
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 |