diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-29 22:29:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-29 22:29:53 +0000 |
| commit | 66270beb392d2d5addc156edf33e3d5449ea8b34 (patch) | |
| tree | 0d5586d0adab9208c0ff5695cbcef7dea63fe709 | |
| parent | d2072e5ed82c97e4c729d261f4c18981aef42e2f (diff) | |
| parent | 043e0163edea35f75ddc2263feb59c32a8e8eaa6 (diff) | |
| download | swift-66270beb392d2d5addc156edf33e3d5449ea8b34.tar.gz | |
Merge "Clarify that rsync_io_timeout is also used for contimeout"
| -rw-r--r-- | etc/object-server.conf-sample | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/object-server.conf-sample b/etc/object-server.conf-sample index 9f9f64515..e7466bba8 100644 --- a/etc/object-server.conf-sample +++ b/etc/object-server.conf-sample @@ -266,7 +266,7 @@ use = egg:swift#recon # bandwidth limit for rsync in kB/s. 0 means unlimited # rsync_bwlimit = 0 # -# passed to rsync for io op timeout +# passed to rsync for both io op timeout and connection timeout # rsync_io_timeout = 30 # # Allow rsync to compress data which is transmitted to destination node |