feat(ocm): split ocm discovery and capacities#54385
Merged
ArtificialOwl merged 1 commit intomasterfrom Aug 20, 2025
Merged
Conversation
64032e3 to
81c6825
Compare
8a79b11 to
f9b48dd
Compare
8 tasks
Member
Author
|
red test not related |
Member
Author
|
/backport to stable31 |
f9b48dd to
f07b697
Compare
susnux
approved these changes
Aug 15, 2025
provokateurin
approved these changes
Aug 19, 2025
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
f07b697 to
fa60488
Compare
Member
Author
|
(rebased + conflict fix) |
|
The backport to # Switch to the target branch and update it
git checkout stable31
git pull origin stable31
# Create the new backport branch
git checkout -b backport/54385/stable31
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick fa60488e
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/54385/stable31Error: Failed to check for changes with origin/stable31: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
Merged
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
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.
Uh oh!
There was an error while loading. Please reload this page.