Permalink
Browse files

Merge branch 'atmos' into services-r6

Change-Id: Iafabf81a6e06285db74fc7bc360e554177e6dfeb
  • Loading branch information...
2 parents 6df3fa3 + 9697f02 commit d4684b66a70370d857078e3fc9ba6c9c8b63c527 figo committed Nov 13, 2011
Showing with 6 additions and 0 deletions.
  1. +4 −0 bin/services/atmos_gateway
  2. +2 −0 cloud_controller/config/cloud_controller.yml
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+# Copyright (c) 2009-2011 VMware, Inc.
+
+exec(File.expand_path("../../../services/atmos/bin/atmos_gateway", __FILE__), *ARGV)
@@ -131,6 +131,8 @@ builtin_services:
token: "0xdeadbeef"
neo4j:
token: "0xdeadbeef"
+ atmos:
+ token: "0xdeadbeef"
# Service broker
service_broker:

0 comments on commit d4684b6

Please sign in to comment.