Skip to content

feat(ocm): split ocm discovery and capacities - #54385

Merged
ArtificialOwl merged 1 commit into
masterfrom
fix/51946/split-discovery-capacities
Aug 20, 2025
Merged

feat(ocm): split ocm discovery and capacities#54385
ArtificialOwl merged 1 commit into
masterfrom
fix/51946/split-discovery-capacities

Conversation

@ArtificialOwl

@ArtificialOwlArtificialOwl commented Aug 12, 2025

Copy link
Copy Markdown
Member

@ArtificialOwl
ArtificialOwl requested a review from a team as a code ownerAugust 12, 2025 18:43
@ArtificialOwl
ArtificialOwl requested review from icewind1991, provokateurin and salmart-dev and removed request for a teamAugust 12, 2025 18:43
@ArtificialOwl
ArtificialOwlforce-pushed the fix/51946/split-discovery-capacities branch 2 times, most recently from 64032e3 to 81c6825CompareAugust 12, 2025 23:31
@ArtificialOwl
ArtificialOwlforce-pushed the fix/51946/split-discovery-capacities branch 2 times, most recently from 8a79b11 to f9b48ddCompareAugust 13, 2025 00:18
@ArtificialOwl

Copy link
Copy Markdown
MemberAuthor

red test not related

@ArtificialOwl

Copy link
Copy Markdown
MemberAuthor

/backport to stable31

@ArtificialOwl
ArtificialOwlforce-pushed the fix/51946/split-discovery-capacities branch from f9b48dd to f07b697CompareAugust 14, 2025 14:27
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
@ArtificialOwl
ArtificialOwlforce-pushed the fix/51946/split-discovery-capacities branch from f07b697 to fa60488CompareAugust 20, 2025 12:58
@ArtificialOwl

ArtificialOwl commented Aug 20, 2025

Copy link
Copy Markdown
MemberAuthor

(rebased + conflict fix)

@ArtificialOwl
ArtificialOwl merged commit 776a689 into masterAug 20, 2025
201 of 202 checks passed
@ArtificialOwl
ArtificialOwl deleted the fix/51946/split-discovery-capacities branch August 20, 2025 13:31
@backportbot

Copy link
Copy Markdown

The backport to stable31 failed. Please do this backport manually.

# 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/stable31

Error: 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.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: NC31 logs "Capabilities of OCA\\CloudFederationAPI\\Capabilities took 0.xx seconds to generate" on every page refresh.

4 participants

@ArtificialOwl@susnux@provokateurin@joshtrichards