diff options
| author | Max Martin <max@puppetlabs.com> | 2011-04-07 12:22:30 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-04-07 12:22:30 -0700 |
| commit | fe45c2417af580597cd39adec96a30a05a7cd66a (patch) | |
| tree | 38191b4766c8e2354c27c0868c12e0e254b4389f /lib/puppet/network | |
| parent | 9c06fbd762cddcc41a7185a36f2a8e72879125eb (diff) | |
| parent | 20bff91c8b8e450d913deeb1750a00a14f1b1061 (diff) | |
Merge branch 'next'
* next: (23 commits)
(maint) Indentation fixes
(#6490) Add plugin initialization callback system to core
(Maint) Fix uninitialized constant.
(5200) -- replace containers with sentinals
(#5528) Add REST API for signing, revoking, retrieving, cleaning certs
Fix #4339 - Locally save the last report to $lastrunreport
Fix #4339 - Save a last run report summary to $statedir/last_run_summary.yaml
Fixed #3127 - removed legacy debug code
Fixed #3127 - Fixed gem selection regex
(6911) Cleanup and renaming of transaction internals
(6911) Core change -- replace topsort with frontier ordered by salted SHA1
(6911) Add bookkeeping facade around Transaction#relationship_graph
(#5437) Invalidate cached TypeCollection when there was an error parsing
(#6937) Adjust formatting of recurse's desc
(#6937) Document the recurse parameter of File type.
(#6937) Document the recurse parameter of File type.
(6911) Cleanup of generate_additional_resources
(6911) Refactor to localize eval_generate dependency assumptions
(#6893) Document the cron type in the case of specials.
(maint) Fix for require order issue
...
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/http/api/v1.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/network/http/api/v1.rb b/lib/puppet/network/http/api/v1.rb index dcb0e0a22..5fe143979 100644 --- a/lib/puppet/network/http/api/v1.rb +++ b/lib/puppet/network/http/api/v1.rb @@ -61,6 +61,7 @@ module Puppet::Network::HTTP::API::V1 # that leads to the fix being too long. return :singular if indirection == "facts" return :singular if indirection == "status" + return :singular if indirection == "certificate_status" return :plural if indirection == "inventory" result = (indirection =~ /s$|_search$/) ? :plural : :singular |