From 20c61cf646969f5e0a94abd831dc66914d87180c Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-1.psi.ch>
Date: Thu, 7 Nov 2019 15:43:30 +0100
Subject: [PATCH] Startup

---
 config/config.properties    | 23 ++++++++++++-----------
 config/variables.properties |  4 ++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/config/config.properties b/config/config.properties
index 594015ac..d0166cee 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,23 +1,17 @@
-#Thu Nov 07 09:27:57 CET 2019
-autoSaveScanData=true
-simulation=false
-commandExecutionEvents=false
-logDaysToLive=50
-userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\://d.psi.ch | d.psi.ch | users.psi
-logLevelConsole=Off
-scanStreamerPort=-1
-scanStreamingPort=-1
-devicePoolFile={config}/devices.properties
-versionTrackingManual=false
+#Thu Nov 07 15:10:34 CET 2019
 hostName=x03da-cons-1
 userManagement=false
 instanceName=x03da
+autoSaveScanData=true
+simulation=false
 dataServerPort=-1
 hideServerMessages=false
 serverPort=8080
 versionTrackingEnabled=true
 dataPath={data}/{year}/{month}/Niels/sample_8_postSTM/pshell-{date}-{time}-{name}
 serverEnabled=false
+commandExecutionEvents=false
+logDaysToLive=50
 dataScanReleaseRecords=true
 depthDimension=2
 dataScanPreserveTypes=false
@@ -28,11 +22,18 @@ dataLayout=default
 deviceUpdateStrategyFile={config}/update.properties
 terminalEnabled=true
 notificationLevel=Error
+userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\://d.psi.ch | d.psi.ch | users.psi
+logLevelConsole=Off
 terminalPort=3579
 tasksFile={config}/tasks.properties
+scanStreamerPort=-1
+parallelInitialization=false
+scanStreamingPort=-1
 createSessionFiles=true
 versionTrackingLogin={context}/svcusr-hlapp_robot
+devicePoolFile={config}/devices.properties
 scriptType=py
+versionTrackingManual=false
 versionTrackingRemote=git@git.psi.ch\:pshell_config/x03da.git
 dataProvider=default
 saveCommandStatistics=false
diff --git a/config/variables.properties b/config/variables.properties
index ee2abd07..a3db2ccd 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,2 +1,2 @@
-#Tue Nov 05 16:49:49 CET 2019
-FileSequentialNumber=790
+#Thu Nov 07 15:16:07 CET 2019
+FileSequentialNumber=812