Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bot] Merge 24.3 to develop #79

Merged
merged 4 commits into from
Mar 20, 2024
Merged

[bot] Merge 24.3 to develop #79

merged 4 commits into from
Mar 20, 2024

Conversation

github-actions[bot]
Copy link

Generated automatically.
Merging changes from: a800169
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_24.3

labkey-stuartm and others added 4 commits March 15, 2024 11:01
* set bootstrap full text index path (#64)

* bump openssl version (#67)

* update labkeyServer.jar file name

---------

Co-authored-by: github-actions <teamcity@labkey.com>
* remove rename of jar file to app.jar

* update jar file copy path
* set bootstrap full text index path (#64)

* bump openssl version (#67)

* uniquify container names for latest docker-compose

* issue 49843: update ciphers to latest default

* Update Dockerfile with suggested ciphers

Co-authored-by: Josh Eckels <jeckels@labkey.com>

* Update application.properties with suggested ciphers

Co-authored-by: Josh Eckels <jeckels@labkey.com>

* revert accidental logging change

---------

Co-authored-by: labkey-stuartm <32204841+labkey-stuartm@users.noreply.github.com>
Co-authored-by: github-actions <teamcity@labkey.com>
Co-authored-by: Josh Eckels <jeckels@labkey.com>
@github-actions github-actions bot merged commit 0ab6ea7 into develop Mar 20, 2024
1 check passed
@github-actions github-actions bot deleted the fb_bot_merge_24.3 branch March 20, 2024 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants