Merge lp:~devcamcar/swift/lp717967 into lp:~hudson-openstack/swift/trunk

Proposed by Devin Carlen
Status: Merged
Approved by: gholt
Approved revision: 216
Merged at revision: 216
Proposed branch: lp:~devcamcar/swift/lp717967
Merge into: lp:~hudson-openstack/swift/trunk
Diff against target: 20 lines (+3/-0)
1 file modified
etc/rsyncd.conf-sample (+3/-0)
To merge this branch: bzr merge lp:~devcamcar/swift/lp717967
Reviewer Review Type Date Requested Status
gholt (community) Approve
Review via email: mp+49530@code.launchpad.net

Description of the change

Added lock file configuration to sample rsync.conf.

To post a comment you must log in.
Revision history for this message
gholt (gholt) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/rsyncd.conf-sample'
2--- etc/rsyncd.conf-sample 2010-07-19 16:25:18 +0000
3+++ etc/rsyncd.conf-sample 2011-02-13 02:37:53 +0000
4@@ -7,13 +7,16 @@
5 max connections = 2
6 path = /srv/node
7 read only = false
8+lock file = /var/lock/account.lock
9
10 [container]
11 max connections = 4
12 path = /srv/node
13 read only = false
14+lock file = /var/lock/container.lock
15
16 [object]
17 max connections = 8
18 path = /srv/node
19 read only = false
20+lock file = /var/lock/object.lock