diff options
| author | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2016-11-20 00:23:07 +0100 |
|---|---|---|
| committer | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2016-11-20 00:23:07 +0100 |
| commit | 691aa85bfaec80c08330db772499a123b2ac2373 (patch) | |
| tree | 2e1ff2f4b5acba693b9bc1ae01dd4acb2cee8d1c /src/fs/gnunet-service-fs_pr.c | |
| parent | 39981eee3163a1795026e8670ac5b669426f268b (diff) | |
| parent | ffc906fa758dcc89eaabce14b754d311d3321dd4 (diff) | |
| download | gnunet-691aa85bfaec80c08330db772499a123b2ac2373.tar.gz gnunet-691aa85bfaec80c08330db772499a123b2ac2373.zip | |
Merge branch 'master' into credentials
Diffstat (limited to 'src/fs/gnunet-service-fs_pr.c')
| -rw-r--r-- | src/fs/gnunet-service-fs_pr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index f8a7b61f0..63462f7dc 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c | |||
| @@ -1036,7 +1036,7 @@ put_migration_continuation (void *cls, int success, | |||
| 1036 | ppd->migration_delay); | 1036 | ppd->migration_delay); |
| 1037 | mig_pause.rel_value_us = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, | 1037 | mig_pause.rel_value_us = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, |
| 1038 | ppd->migration_delay.rel_value_us); | 1038 | ppd->migration_delay.rel_value_us); |
| 1039 | ppd->migration_delay = GNUNET_TIME_relative_multiply (ppd->migration_delay, 2); | 1039 | ppd->migration_delay = GNUNET_TIME_relative_saturating_multiply (ppd->migration_delay, 2); |
| 1040 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1040 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
| 1041 | "Replicated content already exists locally, asking to stop migration for %s\n", | 1041 | "Replicated content already exists locally, asking to stop migration for %s\n", |
| 1042 | GNUNET_STRINGS_relative_time_to_string (mig_pause, | 1042 | GNUNET_STRINGS_relative_time_to_string (mig_pause, |