Permalink
Browse files

Merge "Bump vcap_common for service_broker to make acls optional" int…

…o services-r9
  • Loading branch information...
2 parents 8b12af4 + 9077c3d commit fd50300f5ca9a9187a3e413cd330e62901c4865c felixhoo committed with Gerrit Code Review Mar 6, 2012
@@ -118,7 +118,7 @@ GEM
uuid (2.3.4)
macaddr (~> 1.0)
uuidtools (2.1.2)
- vcap_common (1.0.8)
+ vcap_common (1.0.10)
eventmachine (~> 0.12.11.cloudfoundry.3)
nats (~> 0.4.22.beta.8)
posix-spawn (~> 0.3.6)
@@ -22,7 +22,7 @@ class BrokeredService
property :name, String, :required => true
property :version, String, :required => true
property :credentials, Json, :required => true
- property :acls, Json, :required => true
+ property :acls, Json
end
REQ_OPTS = %w(mbus external_uri token cloud_controller_uri).map {|o| o.to_sym}
@@ -419,7 +419,7 @@ def provision_brokered_service(request)
success(svc)
else
@logger.warn("Can't find service label=#{request.label}")
- raise ServiceError.new(ServiceError::NOT_FOUND, req.label)
+ raise ServiceError.new(ServiceError::NOT_FOUND, request.label)
end
rescue => e
if e.instance_of? ServiceError
Binary file not shown.
Binary file not shown.

0 comments on commit fd50300

Please sign in to comment.