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

[Chmouel Boudjnah]

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-10 14:45:14 +0000
+++ debian/changelog	2012-02-22 15:31:24 +0000
@@ -11,6 +11,12 @@
 
  -- Chuck Short <[e-mail]>  Fri, 03 Feb 2012 09:35:18 -0500
 
+swift (1.4.6~20120119.1666-0ubuntu3) oneiric; urgency=low
+
+  * Add more samples to packages (LP:#667935)
+
+ -- Chmouel Boudjnah <[e-mail]>  Wed, 22 Feb 2012 14:41:14 +0000
+
 swift (1.4.6~20120119.1666-0ubuntu2) precise; urgency=low
 
   * Update swift.install to reflect release. 
 
=== modified file 'debian/swift-object.docs'
--- debian/swift-object.docs	2011-01-14 10:55:59 +0000
+++ debian/swift-object.docs	2012-02-22 15:31:24 +0000
@@ -1,2 +1,3 @@
 etc/object-server.conf-sample
 etc/rsyncd.conf-sample
+etc/object-expirer.conf-sample
 
=== modified file 'debian/swift-proxy.docs'
--- debian/swift-proxy.docs	2011-04-01 15:35:00 +0000
+++ debian/swift-proxy.docs	2012-02-22 15:31:24 +0000
@@ -1,2 +1,3 @@
 etc/proxy-server.conf-sample
 etc/mime.types-sample
+etc/memcache.conf-sample
 
=== modified file 'debian/swift.docs'
--- debian/swift.docs	2011-01-14 10:55:59 +0000
+++ debian/swift.docs	2012-02-22 15:31:24 +0000
@@ -1,2 +1,4 @@
 etc/stats.conf-sample
 etc/drive-audit.conf-sample
+etc/swift.conf-sample
+etc/dispersion.conf-sample