Continuation of #1309: Implementation of the resource manager server (issue #1294) #1319
Conversation
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
(otherwise "first among configured" logic does not work)
…cking'"" This reverts commit 22f3c7b.
drop ocrd-distributed resource_list.yml for good
…rt-gitdownload resmgr download: implement git clone
…94-impl-rm-server-revert-revert
1a008dd to
b2c57e5
Compare
MehmedGIT
approved these changes
Dec 10, 2025
Contributor
MehmedGIT
left a comment
There was a problem hiding this comment.
Everything seems to work fine and can be merged.
Contributor
|
3df4560 is needed; otherwise, the Docker client cannot connect since the minimum API v1.44 is required by Docker v29. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This branch should be back in a state it can be worked on.
I did:
masterinto itI.e. we should be back where we were before the accidental merge, plus the @bertsky's commits from yesterday.
Only the newer commits show up here because they are already part of
masterthough, but they are there and reflected in the worktree.