diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-21 20:20:35 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-21 20:20:35 +0300 |
| commit | 2634a16b4cefebfb2a13550bde3fd12e5acd9aaa (patch) | |
| tree | 1c43808f90f13a9e055464f01e4c8a36b28fe50b /benchmarks/load_testing | |
| parent | b830605577f369d6b1a8730a5b3476ceea4fef5a (diff) | |
| parent | d8860eaee46c9bc0a079e90dfb008c54923d7330 (diff) | |
| download | pleroma-2634a16b4cefebfb2a13550bde3fd12e5acd9aaa.tar.gz pleroma-2634a16b4cefebfb2a13550bde3fd12e5acd9aaa.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'benchmarks/load_testing')
| -rw-r--r-- | benchmarks/load_testing/users.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/benchmarks/load_testing/users.ex b/benchmarks/load_testing/users.ex index 34a904ac2..0a33cbfdb 100644 --- a/benchmarks/load_testing/users.ex +++ b/benchmarks/load_testing/users.ex @@ -55,7 +55,7 @@ defmodule Pleroma.LoadTesting.Users do name: "Test ใในใ User #{i}", email: "user#{i}@example.com", nickname: "nick#{i}", - password_hash: Pbkdf2.hash_pwd_salt("test"), + password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt("test"), bio: "Tester Number #{i}", local: !remote } |