# HG changeset patch
# User smith@nwoca.org
# Date 1515695571 0
# Node ID f994e8eca29f874477077633b72f8b80197f0e85
# Parent  84c830c42d557936e46a15573d2a8e427a5e7b4f# Parent  55b4143fd39ef69098700d94f87b2d451025d175
flow: Merged <hotfix> 'v2.0.1' to <develop> ('default').

diff -r 84c830c42d55 -r f994e8eca29f .hgtags
--- a/.hgtags	Wed Jan 10 01:42:43 2018 +0000
+++ b/.hgtags	Thu Jan 11 18:32:51 2018 +0000
@@ -3,3 +3,12 @@
 73c0c04a44eb08462f9f94f4256fdf905f339f85 v1.1.1
 daf91a3bbee56ebe7d293a72c9e8732ac1bce724 v1.2.0
 577d9750fe01f3fad68bffd1908612abe87d794d v1.2.1
+fc93880cda8dd707dd84f9605c7b64750ee93bab hotfix/1.2.2
+26bb64873bbe5a7cf7ca85fe4b8922ef8923507c v1.3.0
+e05f5379eb0e10e15c7f48a3e0a2b6cb7b9328d2 vv1.4.0
+c34bcbea839125bc97b4e90302d4aa32250efddd v1.5.0
+07670d4d3d32f8b6e0126f13be20850bcf1fd38c v1.6.0
+07670d4d3d32f8b6e0126f13be20850bcf1fd38c v1.6.0
+04030a5e355aca8acb297e65e9841d4fed57e10c v1.6.0
+6210629ba54fa42e34352e2112b5bd93098ef4ea v1.7.0
+fa943a14123d1211d00302f65c077a009eab753f v2.0.0
diff -r 84c830c42d55 -r f994e8eca29f prod/import-usas.sh
--- a/prod/import-usas.sh	Wed Jan 10 01:42:43 2018 +0000
+++ b/prod/import-usas.sh	Thu Jan 11 18:32:51 2018 +0000
@@ -11,11 +11,11 @@
 export IMP_PATH=${IMP_PATH}
 
 [ -f "docker-compose.override.yml" ] && export OVERRIDE=" -f docker-compose.override.yml"
-[ -f "docker-compose.usasimport.override.yml" ] && export OVERRIDE2=" -f docker-compose.usasimport.override.yml"
+ [ -f "docker-compose.usasimport.override.yml" ] && export OVERRIDE2=" -f docker-compose.usasimport.override.yml"
 #
 docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE rm -f usasimport 
 # start import and wait for completion
-docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE $OVERRIDE2 up usasimport | tee usasimport.log
+ docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE $OVERRIDE2 up usasimport | tee usasimport.log
 # remove temporary container
 docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE rm -f usasimport
 # start application
diff -r 84c830c42d55 -r f994e8eca29f prod/usps-services.yml
--- a/prod/usps-services.yml	Wed Jan 10 01:42:43 2018 +0000
+++ b/prod/usps-services.yml	Thu Jan 11 18:32:51 2018 +0000
@@ -1,34 +1,34 @@
-  uspsdb:
-    restart: unless-stopped
-    image: docker.ssdt.io/ssdt-postgres:5
-    volumes:
-      - uspsdata:/var/lib/postgresql/data
-    networks:
-      - default
-    environment:
-      - DB_NAME=uspsdb
-      - DB_USER=usps
-      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
-  uspsapp:
-    restart: unless-stopped
-    image: docker.ssdt.io/usps-app:${USPS_TAG:-prod}
-    depends_on:
-      - uspsdb
-    networks:
-      default:
-        aliases:
-        - ${USPS_APP_HOST:-uspsapp-svr}
-    environment:
-      - DB_HOST=uspsdb
-      - DB_NAME=uspsdb
-      - DB_USER=usps
-      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
-      - DB_POOL_LEAKDETECTIONTHRESHOLD=300000
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTHOST=${USAS_APP_HOST:-usasapp-svr}
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTDNSLOOKUP=true
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERHOST=0.0.0.0
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERHOSTDNSLOOKUP=false
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_APPLICATIONID=${USPS_APPLICATIONID:- }
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_APIKEY=${USPS_APIKEY:- }
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_REMOTEAPPLICATIONID=${USAS_APPLICATIONID:- }
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_REMOTEAPIKEY=${USAS_APIKEY:- }
+  uspsdb:
+    restart: unless-stopped
+    image: docker.ssdt.io/ssdt-postgres:5
+    volumes:
+      - uspsdata:/var/lib/postgresql/data
+    networks:
+      - default
+    environment:
+      - DB_NAME=uspsdb
+      - DB_USER=usps
+      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
+  uspsapp:
+    restart: unless-stopped
+    image: docker.ssdt.io/usps-app:${USPS_TAG:-prod}
+    depends_on:
+      - uspsdb
+    networks:
+      default:
+        aliases:
+        - ${USPS_APP_HOST:-uspsapp-svr}
+    environment:
+      - DB_HOST=uspsdb
+      - DB_NAME=uspsdb
+      - DB_USER=usps
+      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
+      - DB_POOL_LEAKDETECTIONTHRESHOLD=300000
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTHOST=${USAS_APP_HOST:-usasapp-svr}
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTDNSLOOKUP=true
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERHOST=0.0.0.0
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERHOSTDNSLOOKUP=false
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_APPLICATIONID=${USPS_APPLICATIONID:- }
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_APIKEY=${USPS_APIKEY:- }
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_REMOTEAPPLICATIONID=${USAS_APPLICATIONID:- }
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_REMOTEAPIKEY=${USAS_APIKEY:- }