summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network/http/api
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2010-10-28 15:11:01 -0700
committerMatt Robinson <matt@puppetlabs.com>2010-10-28 15:11:01 -0700
commit1b60cc3c299306d783d9b0e9368726d2c04c9f21 (patch)
tree65d227ec46a7259a2a06221889cb48d1698dff3a /lib/puppet/network/http/api
parente559b48d51c53c4a345353de1e196634c7430195 (diff)
parent45a9a97285d99db524d5330c236352b29e5884ed (diff)
Merge branch 'ticket/next/5132' into next
* ticket/next/5132: (#5132) Provide a query REST interface for inventory
Diffstat (limited to 'lib/puppet/network/http/api')
-rw-r--r--lib/puppet/network/http/api/v1.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/network/http/api/v1.rb b/lib/puppet/network/http/api/v1.rb
index dd4612a14..2a4736365 100644
--- a/lib/puppet/network/http/api/v1.rb
+++ b/lib/puppet/network/http/api/v1.rb
@@ -57,9 +57,8 @@ module Puppet::Network::HTTP::API::V1
# fix to not need this, and our goal is to move away from the complication
# that leads to the fix being too long.
return :singular if indirection == "facts"
-
- # "status" really is singular
return :singular if indirection == "status"
+ return :plural if indirection == "inventory"
result = (indirection =~ /s$/) ? :plural : :singular