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

[stable21] Increase from 100000 to 600000 iterations for hash_pbkdf2 #39024

Merged
merged 1 commit into from
Jul 17, 2023

Conversation

come-nc
Copy link
Contributor

@come-nc come-nc commented Jun 27, 2023

Backport #38584

[stable24] Increase from 100000 to 600000 iterations for hash_pbkdf2

(cherry picked from commit a7dc41f)

Checklist

[stable24] Increase from 100000 to 600000 iterations for hash_pbkdf2

(cherry picked from commit a7dc41f)
@come-nc come-nc self-assigned this Jun 27, 2023
@come-nc come-nc requested review from a team, ArtificialOwl, icewind1991 and Fenn-CS and removed request for a team June 29, 2023 07:48
@come-nc come-nc added the 3. to review Waiting for reviews label Jun 29, 2023
@come-nc
Copy link
Contributor Author

come-nc commented Jun 29, 2023

/backport to stable20

@come-nc
Copy link
Contributor Author

come-nc commented Jun 29, 2023

/backport to stable19

@come-nc come-nc merged commit bfcf910 into stable21 Jul 17, 2023
16 of 21 checks passed
@come-nc come-nc deleted the backport/38584/stable21 branch July 17, 2023 12:34
@come-nc
Copy link
Contributor Author

come-nc commented Jul 17, 2023

/backport to stable18

@come-nc
Copy link
Contributor Author

come-nc commented Jul 17, 2023

/backport to stable17

@come-nc
Copy link
Contributor Author

come-nc commented Jul 17, 2023

/backport to stable16

@backportbot-nextcloud
Copy link

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

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

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

# 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-stable16

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

@backportbot-nextcloud
Copy link

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

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

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

# 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-stable18

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

@backportbot-nextcloud
Copy link

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

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

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

# 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-stable17

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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants