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.

Sign up for GitHub

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

ID-347 Remove Martha References #7384

Merged
merged 2 commits into from
Mar 12, 2024
Merged

ID-347 Remove Martha References #7384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5256f7
ID-347 Remove Martha References
tlangs Mar 11, 2024
7875606
Merge branch 'develop' into tl_ID-347_remove_martha_references
tlangs Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .../cloud-nio-impl-drs/src/main/scala/cloud/nio/impl/drs/DrsCloudNioFileSystemProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ class DrsCloudNioFileSystemProvider(rootConfig: Config,
drsReadInterpreter: DrsReadInterpreter
) extends CloudNioFileSystemProvider {

lazy val drsResolverConfig =
if (rootConfig.hasPath("resolver")) rootConfig.getConfig("resolver") else rootConfig.getConfig("martha")
lazy val drsResolverConfig = rootConfig.getConfig("resolver")
lazy val drsConfig: DrsConfig = DrsConfig.fromConfig(drsResolverConfig)

lazy val drsPathResolver: EngineDrsPathResolver =
Expand Down
2 changes: 1 addition & 1 deletion docs/filesystems/Filesystems.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ filesystems {
class = "cromwell.filesystems.drs.DrsFileSystemConfig"
config {
resolver {
url = "https://martha-url-here or https://drshub-url-here"
url = https://drshub-url-here"
# The number of times to retry failures connecting or HTTP 429 or HTTP 5XX responses, default 3.
num-retries = 3
# How long to wait between retrying HTTP 429 or HTTP 5XX responses, default 10 seconds.
Expand Down
Loading