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

[stable28] fix(dav): Add retention time to sync token cleanup #44398

Merged
merged 1 commit into from
Jun 5, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Mar 21, 2024

Backport of #44075

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot added bug 3. to review Waiting for reviews feature: dav feature: caldav Related to CalDAV internals feature: carddav Related to CardDAV internals labels Mar 21, 2024
@backportbot backportbot bot added this to the Nextcloud 28.0.4 milestone Mar 21, 2024
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@kesselb kesselb force-pushed the backport/44075/stable28 branch from 8633a10 to 402bb77 Compare June 4, 2024 17:07
@kesselb
Copy link
Contributor

kesselb commented Jun 4, 2024

Conflicts:

We merged a couple of other backports to stable28 meanwhile and therefore the last conflict after rebasing was the version number in info.xml

@kesselb kesselb marked this pull request as ready for review June 4, 2024 17:16
@kesselb kesselb added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 5, 2024
@Altahrim Altahrim merged commit 393406b into stable28 Jun 5, 2024
56 checks passed
@Altahrim Altahrim deleted the backport/44075/stable28 branch June 5, 2024 12:54
@blizzz blizzz mentioned this pull request Jun 11, 2024
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: caldav Related to CalDAV internals feature: carddav Related to CardDAV internals feature: dav
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants