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

[stable22] Increase from 100000 to 600000 iterations for hash_pbkdf2 #38913

Merged
merged 2 commits into from
Jun 22, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

Backport of #38584

@come-nc come-nc changed the title [stable22] [stable24] Increase from 100000 to 600000 iterations for hash_pbkdf2 [stable22] Increase from 100000 to 600000 iterations for hash_pbkdf2 Jun 22, 2023
@blizzz blizzz merged commit 7400d50 into stable22 Jun 22, 2023
@blizzz blizzz deleted the backport/38584/stable22 branch June 22, 2023 10:37
@come-nc
Copy link
Contributor

come-nc commented Jun 26, 2023

/backport to stable21

@backportbot-nextcloud
Copy link
Author

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

# Switch to the target branch and update it
git checkout stable21
git pull origin stable21

# Create the new backport branch
git checkout -b fix/foo-stable21

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable21

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to 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.

3 participants