Merge branch 'atmos' into services-r6

Change-Id: Iafabf81a6e06285db74fc7bc360e554177e6dfeb
youdao-cf · Nov 13, 2011 · d4684b6 · d4684b6
2 parents 6df3fa3 + 9697f02
commit d4684b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/bin/services/atmos_gateway b/bin/services/atmos_gateway
@@ -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)
diff --git a/cloud_controller/config/cloud_controller.yml b/cloud_controller/config/cloud_controller.yml
@@ -131,6 +131,8 @@ builtin_services:
     token: "0xdeadbeef"
   neo4j:
     token: "0xdeadbeef"
+  atmos:
+    token: "0xdeadbeef"
 
 # Service broker
 service_broker: