Merge pull request GPII#32 from GPII/v0.2

Merging v0.2 into master.
kaspermarkus · Oct 10, 2013 · 56774cf · 56774cf
2 parents 2af13b5 + 676d790
commit 56774cf
Show file tree

Hide file tree

Showing 6 changed files with 380 additions and 28 deletions.
diff --git a/gpii.js b/gpii.js
@@ -17,6 +17,6 @@ fluid.require("gsettingsBridge", require);
 fluid.require("orca", require);
 
 kettle.config.makeConfigLoader({
-    nodeEnv: kettle.config.getNodeEnv("fm.ps.sr.dr.mm.os.development"),
+    nodeEnv: kettle.config.getNodeEnv("fm.ps.sr.dr.mm.os.lms.development"),
     configPath: kettle.config.getConfigPath() || "../node_modules/universal/gpii/configs"
 });
diff --git a/node_modules/gsettingsBridge/gsettings_bridge.js b/node_modules/gsettingsBridge/gsettings_bridge.js
diff --git a/node_modules/gsettingsBridge/tests/gsettingsTests.js b/node_modules/gsettingsBridge/tests/gsettingsTests.js
diff --git a/node_modules/orca/orcaSettingsHandler.js b/node_modules/orca/orcaSettingsHandler.js