Merge 24.11 to 25.1

LabKey · Jan 7, 2025 · da5a3bd · da5a3bd
2 parents 55377ad + c5f1bc0
commit da5a3bd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/quickstart_envs.sh b/quickstart_envs.sh
@@ -3,7 +3,7 @@
 # example minimal set of environment variables to get started - see readme for additional envs you may wish to set
 
 # embedded tomcat LabKey .jar version to build container with
-export LABKEY_VERSION="24.6"
+export LABKEY_VERSION="24.11"
 
 # minimal SMTP settings
 export SMTP_HOST="localhost"

diff --git a/startup/basic.properties b/startup/basic.properties
@@ -14,7 +14,6 @@ SiteSettings.pipelineToolsDirectory;bootstrap=${LABKEY_HOME}
 
 SiteSettings.sslPort;startup=${LABKEY_PORT}
 SiteSettings.sslRequired;startup=true
-FileLinkMetrics.EnableFileLinkMetricsTask;startup=true
 
 SearchSettings.indexFilePath;bootstrap=${LABKEY_FILES_ROOT}/labkey_full_text_index
 SiteSettings.readOnlyHttpRequestTimeout;startup=605