Merge remote-tracking branch 'yzen/GPII-30'

* yzen/GPII-30: GPII-30: fixing a type in gpii.js GPII-30: Updating gpii.js and removing start.sh GPII-30: Updated the way the flowManager is started from the linux repo
GPII · Aug 29, 2012 · f1a0ad0 · f1a0ad0
2 parents 7a9a968 + e98ccdc
commit f1a0ad0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/gpii.js b/gpii.js
@@ -15,4 +15,7 @@ var fluid = require("universal"),
 
 fluid.require("gsettingsBridge", require);
 
-gpii.flowManager();
+gpii.config.makeConfigLoader({
+    nodeEnv: gpii.config.getNodeEnv(),
+    configPath: gpii.config.getConfigPath() || "../node_modules/universal/gpii/node_modules/flowManager/configs"
+});
diff --git a/start.sh b/start.sh