Merge lp:~chmouel/swift/lp667935 into lp:~openstack-ubuntu-packagers/swift/ubuntu

Proposed by Chmouel Boudjnah on 2012-02-22
Status: Merged
Merged at revision: 62
Proposed branch: lp:~chmouel/swift/lp667935
Merge into: lp:~openstack-ubuntu-packagers/swift/ubuntu
Diff against target: 41 lines (+10/-0)
4 files modified
debian/changelog (+6/-0)
debian/swift-object.docs (+1/-0)
debian/swift-proxy.docs (+1/-0)
debian/swift.docs (+2/-0)
To merge this branch: bzr merge lp:~chmouel/swift/lp667935
Reviewer Review Type Date Requested Status
OpenStack Ubuntu packagers 2012-02-22 Pending
Review via email: mp+94199@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-02-10 14:45:14 +0000
3+++ debian/changelog 2012-02-22 15:31:24 +0000
4@@ -11,6 +11,12 @@
5
6 -- Chuck Short <zulcss@ubuntu.com> Fri, 03 Feb 2012 09:35:18 -0500
7
8+swift (1.4.6~20120119.1666-0ubuntu3) oneiric; urgency=low
9+
10+ * Add more samples to packages (LP:#667935)
11+
12+ -- Chmouel Boudjnah <chmouel@chmouel.com> Wed, 22 Feb 2012 14:41:14 +0000
13+
14 swift (1.4.6~20120119.1666-0ubuntu2) precise; urgency=low
15
16 * Update swift.install to reflect release.
17
18=== modified file 'debian/swift-object.docs'
19--- debian/swift-object.docs 2011-01-14 10:55:59 +0000
20+++ debian/swift-object.docs 2012-02-22 15:31:24 +0000
21@@ -1,2 +1,3 @@
22 etc/object-server.conf-sample
23 etc/rsyncd.conf-sample
24+etc/object-expirer.conf-sample
25
26=== modified file 'debian/swift-proxy.docs'
27--- debian/swift-proxy.docs 2011-04-01 15:35:00 +0000
28+++ debian/swift-proxy.docs 2012-02-22 15:31:24 +0000
29@@ -1,2 +1,3 @@
30 etc/proxy-server.conf-sample
31 etc/mime.types-sample
32+etc/memcache.conf-sample
33
34=== modified file 'debian/swift.docs'
35--- debian/swift.docs 2011-01-14 10:55:59 +0000
36+++ debian/swift.docs 2012-02-22 15:31:24 +0000
37@@ -1,2 +1,4 @@
38 etc/stats.conf-sample
39 etc/drive-audit.conf-sample
40+etc/swift.conf-sample
41+etc/dispersion.conf-sample

Subscribers

People subscribed via source and target branches