# HG changeset patch
# User smith@nwoca.org
# Date 1515548728 0
# Node ID fa943a14123d1211d00302f65c077a009eab753f
# Parent  773ec9cc88a99db1fda63edda2a2e03b2fe2d3a4# Parent  0e0f7fc084fb5f38e611235a2c1a8535300d07fe
flow: Merged <release> 'v2.0.0' to <master> ('production').

diff -r 0e0f7fc084fb -r fa943a14123d .hgtags
--- a/.hgtags	Wed Jan 10 01:42:42 2018 +0000
+++ b/.hgtags	Wed Jan 10 01:45:28 2018 +0000
@@ -3,3 +3,11 @@
 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
diff -r 0e0f7fc084fb -r fa943a14123d prod/import-usas.sh
--- a/prod/import-usas.sh	Wed Jan 10 01:42:42 2018 +0000
+++ b/prod/import-usas.sh	Wed Jan 10 01:45:28 2018 +0000
@@ -1,23 +1,23 @@
-#!/bin/bash
-
-source "$( dirname "${BASH_SOURCE[0]}")/../scripts/.functions.sh"
-
-docker-compose stop usasapp usasdb
-resetDbVolume usasdb
-docker-compose rm -vf usasapp usasdb
-
-export IMP_IRN=${IMP_IRN}
-export IMP_URL=${IMP_URL-ftp://username:password@nwoca.org}
-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"
-#
-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
-# remove temporary container
-docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE rm -f usasimport
-# start application
-docker-compose up -d usasapp
-
+#!/bin/bash
+
+source "$( dirname "${BASH_SOURCE[0]}")/../scripts/.functions.sh"
+
+docker-compose stop usasapp usasdb
+resetDbVolume usasdb
+docker-compose rm -vf usasapp usasdb
+
+export IMP_IRN=${IMP_IRN}
+export IMP_URL=${IMP_URL-ftp://username:password@nwoca.org}
+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"
+#
+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
+# remove temporary container
+docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE rm -f usasimport
+# start application
+docker-compose up -d usasapp
+