diff options
| author | Max Martin <max@puppetlabs.com> | 2011-02-18 15:24:52 -0800 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-02-18 15:24:52 -0800 |
| commit | d1955e5c92bc5e2eaf25b28b5102b6f7d10922bb (patch) | |
| tree | 7e4421582c3080611a0184033cff0cade2508d80 /lib | |
| parent | 12fd75a7c575ea181f065b6aaffdcb65417aeb35 (diff) | |
| parent | d1f1858ea52d3089fd2088994e80d6f49d7e0347 (diff) | |
| download | puppet-d1955e5c92bc5e2eaf25b28b5102b6f7d10922bb.tar.gz puppet-d1955e5c92bc5e2eaf25b28b5102b6f7d10922bb.tar.xz puppet-d1955e5c92bc5e2eaf25b28b5102b6f7d10922bb.zip | |
Merge branch 'ticket/2.6.next/6376-_search-support' into 2.6.next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/network/http/api/v1.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/network/http/api/v1.rb b/lib/puppet/network/http/api/v1.rb index 0a04a465f..9e51aae36 100644 --- a/lib/puppet/network/http/api/v1.rb +++ b/lib/puppet/network/http/api/v1.rb @@ -63,9 +63,9 @@ module Puppet::Network::HTTP::API::V1 return :singular if indirection == "status" return :plural if indirection == "inventory" - result = (indirection =~ /s$/) ? :plural : :singular + result = (indirection =~ /s$|_search$/) ? :plural : :singular - indirection.sub!(/s$/, '') if result + indirection.sub!(/s$|_search$|es$/, '') result end |