[bot] Merge 26.8 to develop (Conflicts) - #1481
Merged
Merged
Conversation
## Rationale Lack of SMTP timeouts can lead to unresponsive servers: - LabKey/internal-issues#1416 - LabKey/internal-issues#1405 ## Changes - Wire up three SMTP timeout properties: application.properties -> `MailProperties` -> `StandardContext` - Move a few constants from `LabKeyServer` to `LabKeyTomcatServletWebServerFactory` (the one place where they're used)
cnathe
force-pushed
the
fb_bot_merge_26.8
branch
from
August 19, 2026 14:49
374aa76 to
19ef7d5
Compare
cnathe
approved these changes
Aug 19, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automatic merge failed! Please merge
26.8intofb_bot_merge_26.8and resolve conflicts manually.Resolve all conflicts (using IntelliJ or
git mergetool)Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=fb_bot_merge_26.8