Merge ~hloeung/ubuntu-mirror-charm:master into ubuntu-mirror-charm:master

Proposed by Haw Loeung
Status: Merged
Approved by: Barry Price
Approved revision: 302aefef2cada5aee53e51bba65898984a80509e
Merged at revision: eb695f59db3929cff8fe36e27f4baea0937336a0
Proposed branch: ~hloeung/ubuntu-mirror-charm:master
Merge into: ubuntu-mirror-charm:master
Diff against target: 12 lines (+1/-0)
1 file modified
templates/rsyncd-systemd-socket.tmpl (+1/-0)
Reviewer Review Type Date Requested Status
Barry Price Approve
Canonical IS Reviewers Pending
Review via email:

Commit message

Reduce lingering rsync processes by turning on TCP Keepalive (default 2 hrs)

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Barry Price (barryprice) wrote :


review: Approve
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision eb695f59db3929cff8fe36e27f4baea0937336a0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/rsyncd-systemd-socket.tmpl b/templates/rsyncd-systemd-socket.tmpl
2index 33c8676..c77b019 100644
3--- a/templates/rsyncd-systemd-socket.tmpl
4+++ b/templates/rsyncd-systemd-socket.tmpl
5@@ -7,6 +7,7 @@ ListenStream=873
6 Accept=yes
7 MaxConnections=${max_connections}
8 MaxConnectionsPerSource=${max_connections_per_source}
11 [Install]


People subscribed via source and target branches