diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-11-03 20:00:46 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-11-03 20:04:31 -0700 |
| commit | 7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b (patch) | |
| tree | 2ca24f5af952c5ef5456ec85ad4fe9e5acf14ac3 /lib/puppet/network/http/api | |
| parent | 9e2a0e41dfb253a19180aeea6b66f65ca8d63133 (diff) | |
| parent | 4d3c41ee5316285bb0df38aeeb76746016803c16 (diff) | |
Merge branch 'next'
This marks the end of our first agile iteration.
Diffstat (limited to 'lib/puppet/network/http/api')
| -rw-r--r-- | lib/puppet/network/http/api/v1.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/puppet/network/http/api/v1.rb b/lib/puppet/network/http/api/v1.rb index dd4612a14..abbb2dfa9 100644 --- a/lib/puppet/network/http/api/v1.rb +++ b/lib/puppet/network/http/api/v1.rb @@ -30,7 +30,7 @@ module Puppet::Network::HTTP::API::V1 key = URI.unescape(key) - Puppet::Indirector::Request.new(indirection, method, key, params) + [indirection, method, key, params] end def indirection2uri(request) @@ -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 |