Displaying differences for changeset
 
display as  

deploy/8092/conf.json

@@ -78,5 +78,7 @@
  "weps.db": "http://172.1.6.19/weps",
  "wine.path": "/usr/bin/wine",
  "conservation_resources.db": "jdbc:sqlserver://129.82.20.129:1433;databaseName=conservation_resources;user=sa;password=csurams#1",
- "conservation_resources.database": "mssql" 
+ "conservation_resources.database": "mssql",
+ "weps.progress": true 
+ 
 }

web/META-INF/csip-conf.json

@@ -1,5 +1,5 @@
 {
-    "csip-erosion.version": "$version: 1.0.9 c8e2fee07832 2016-09-05 od, built at 2016-09-26 13:34 by brad$",
+    "csip-erosion.version": "$version: 1.0.11 6cf31d14c8b5 2016-09-26 Jakob23, built at 2016-09-30 12:47 by od$",
     "weps.version" : "1.3.9",
     "lmod.db": "jdbc:sqlserver:\/\/129.82.20.242:1433;databaseName=lmod_zedx;user=lmod-rw;password=managements",
     "conservation_resources.db": "jdbc:sqlserver://129.82.20.241:1433;databaseName=conservation_resources;user=sa;password=csurams#1",
@@ -19,5 +19,5 @@
     "csip.logging.keepsevere": "false",
     "csip.accesslog.backend": "none",
     "csip.accesslog.postgres.url": "jdbc:postgresql://192.168.10.110:5432/csiplog?user=postgres",
-    "csip.timezone": "MST7MDT",
+    "csip.timezone": "MST7MDT"
 }