diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-05-26 16:12:09 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-26 16:12:09 -0700 |
| commit | 3c0483fad82d3c5650b8c283f134c043e9074649 (patch) | |
| tree | c1524af6adca257cf7bd9ea7d7fd6a44268210f6 /lib/puppet/indirector | |
| parent | 76887064b7691eb6f6751739df5bc83beee76a80 (diff) | |
| parent | ea7908b8d6dc2092b7a7ff4b92452821a3afd86b (diff) | |
| download | puppet-3c0483fad82d3c5650b8c283f134c043e9074649.tar.gz puppet-3c0483fad82d3c5650b8c283f134c043e9074649.tar.xz puppet-3c0483fad82d3c5650b8c283f134c043e9074649.zip | |
Merge branch 'ticket/2.7rc/maint-faces_docs_spec_fixes' into ticket/2.7rc/maint-doc_changes_without_failures
* ticket/2.7rc/maint-faces_docs_spec_fixes:
maint: Fix order dependent spec failure for face indirection
(#7690) Don't blow up when listing terminuses available for faces
maint: Dedup the loadpath so we don't have to walk it multiple times
Maint: Fix ellipses for short descriptions
Resolved Conflicts:
lib/puppet/interface/documentation.rb
Diffstat (limited to 'lib/puppet/indirector')
| -rw-r--r-- | lib/puppet/indirector/terminus.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/puppet/indirector/terminus.rb b/lib/puppet/indirector/terminus.rb index 4ebd0d004..d488869d1 100644 --- a/lib/puppet/indirector/terminus.rb +++ b/lib/puppet/indirector/terminus.rb @@ -111,12 +111,9 @@ class Puppet::Indirector::Terminus # Return all terminus classes for a given indirection. def terminus_classes(indirection_name) setup_instance_loading indirection_name - - # Load them all. - instance_loader(indirection_name).loadall - - # And return the list of names. - loaded_instances(indirection_name) + instance_loader(indirection_name).files_to_load.map do |file| + File.basename(file).chomp(".rb").intern + end end private |