Merge branch 'master' into dev

accidental checkin to master of a dev change, merging back.

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index eec83fb4d673eca7cfef031d85c55b9728055658..fc69a177102542387b0350c3d9f505bd8e36d531 100644 (file)
--- a/production/feisty_meow_config.ini
+++ b/production/feisty_meow_config.ini
@@ -3,7 +3,7 @@
 # specifies the version of the code that is being constructed here.
 major=2
 minor=140
-revision=106
+revision=107
 build=420
 
 # specifies the remainder of the version record info.

diff --git a/scripts/generator/jenkins_builder.sh b/scripts/generator/jenkins_builder.sh
index a61c3625bd010bf704194d20efd59984b9bc152f..3b67d6e38afa9c3a6b40100d76ba20d4bc2ed0e4 100644 (file)
--- a/scripts/generator/jenkins_builder.sh
+++ b/scripts/generator/jenkins_builder.sh
@@ -14,6 +14,10 @@ if [ -z "$feisty_path" ]; then
 fi
 
 export RUN_ALL_TESTS=true
+# clean up any old home storage paths.
+\rm -rf "$feisty_path/home_store".*
+# set home folder to a new home_store.random folder, for anything that
+# feisty meow needs to store under $HOME.
 export HOME="$(mktemp -d "$feisty_path/home_store.XXXXXX")"
 cd "$feisty_path"
 export FEISTY_MEOW_APEX="$(\pwd)"