# HG changeset patch
# User smith@nwoca.org
# Date 1497629656 -3600
# Node ID 923c2b21fac7f494668e38627e409f91721917d5
# Parent  72f15ffc9ad29f5f18c8694140644b2e1a505b43# Parent  9aabd0f7d16560f55de7ca789f0bc910dd483e46
flow: Merged <hotfix> 'v1.1.1' to <develop> ('default').

diff -r 72f15ffc9ad2 -r 923c2b21fac7 .hgtags
--- a/.hgtags	Mon May 15 23:07:10 2017 +0100
+++ b/.hgtags	Fri Jun 16 17:14:16 2017 +0100
@@ -1,1 +1,2 @@
 63cb9be89a26ba4a69e6bd39a2ba2ee550435f92 v1.0.0
+60bb94387b7dfc56227da60f4b530c4e30a4a985 v1.1.0
diff -r 72f15ffc9ad2 -r 923c2b21fac7 compose/preview/import-usas.yml
--- a/compose/preview/import-usas.yml	Mon May 15 23:07:10 2017 +0100
+++ b/compose/preview/import-usas.yml	Fri Jun 16 17:14:16 2017 +0100
@@ -1,9 +1,16 @@
 usasimport:
   image: docker.ssdt.io/usas-import:preview
+  entrypoint: 
+    - java
+    - -Xmx1600m
+    - -XX:MaxMetaspaceSize=256m
+    - -jar
+    - /opt/import/usas-import.jar
   command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH}
   links:
     - usasdb:database
   environment:
+    - DB_POOL_LEAKDETECTIONTHRESHOLD=0
     - DB_HOST=database
     - DB_NAME=$${DATABASE_ENV_DB_NAME}
     - DB_USER=$${DATABASE_ENV_DB_USER}
diff -r 72f15ffc9ad2 -r 923c2b21fac7 compose/preview/import-usps.yml
--- a/compose/preview/import-usps.yml	Mon May 15 23:07:10 2017 +0100
+++ b/compose/preview/import-usps.yml	Fri Jun 16 17:14:16 2017 +0100
@@ -4,6 +4,7 @@
   links:
     - uspsdb:database
   environment:
+    - DB_POOL_LEAKDETECTIONTHRESHOLD=0
     - DB_HOST=database
     - DB_NAME=$${DATABASE_ENV_DB_NAME}
     - DB_USER=$${DATABASE_ENV_DB_USER}