Merge branch 'test' into center-manage

center-manage/app/config/settings.js

@@ -28,7 +28,14 @@ var settings = {
     if (this.env == "localhost") {
       var localsettings = require("./localsettings");
       return localsettings.kongurl;
-    } else {
+    }
+    else if (this.env == "test") {
+      return "http://kong-dbproxy.kong-test:8001/";
+    }
+    else if (this.env == "pre") {
+      return "http://kong-dbproxy.kong-pre:8001/";
+    }    
+    else {
       return "http://kong-dbproxy.kong:8001/";
     }
   },
@@ -66,7 +73,6 @@ var settings = {
   database: function () {
     if (this.env == "localhost") {
       var localsettings = require("./localsettings");
-      console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>....")
       return localsettings.database;
     } else {
       return {