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

[stable24] Implement collaborative locking #2322

Merged
merged 8 commits into from
Apr 21, 2022

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Apr 21, 2022

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #2248

Signed-off-by: Julius Härtl <jus@bitgrid.net>

TMP: Switch to OCP branch for tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Let locked files open in read only

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Adapt LockScope to LockContext rename

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@backportbot-nextcloud backportbot-nextcloud bot added the enhancement New feature or request label Apr 21, 2022
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 24 milestone Apr 21, 2022
@juliusknorr
Copy link
Member

/compile amend /

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@juliusknorr juliusknorr merged commit fea8872 into stable24 Apr 21, 2022
@delete-merged-branch delete-merged-branch bot deleted the backport/2248/stable24 branch April 21, 2022 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant