Permalink
Browse files

Merge pull request #2 from galthaus/pull-req-master-bcbecabbc2

Merge essex-hack back into development. [3/26]
  • Loading branch information...
2 parents 2044332 + bcbecab commit 41a6ca892e4e74a20a9c55b4f64d319eaa1f7642 @galthaus galthaus committed May 15, 2012
@@ -21,7 +21,7 @@
},
"api": {
"service_port": 5000,
- "service_host": "0.0.0.0",
+ "service_host": "0.0.0.0"
},
"admin": {
"tenant": "admin",
@@ -25,11 +25,7 @@
}},
"api": { "type": "map", "required": true, "mapping": {
"service_port": { "type" : "int", "required" : true },
- "api_port": { "type" : "int", "required" : true },
- "admin_port": { "type" : "int", "required" : true },
- "service_host": { "type" : "str", "required" : true },
- "api_host": { "type" : "str", "required" : true },
- "admin_host": { "type" : "str", "required" : true }
+ "service_host": { "type" : "str", "required" : true }
}},
"admin": { "type": "map", "required": true, "mapping": {
"tenant": { "type" : "str", "required" : true },

0 comments on commit 41a6ca8

Please sign in to comment.