Merge lp:~gandelman-a/swift/ubuntu-merge into lp:~openstack-ubuntu-packagers/swift/ubuntu

[Adam Gandelman]

container-sync must be new, 'swift-init start all' and 'swift-init start container-sync' fail without proper heading in swift-container.conf

Unmerged revisions

53. By Adam Gandelman on 2011-12-23

debian/container-server.conf: Add [container-sync] heading required
to start container-sync

52. By Adam Gandelman on 2011-12-23

debian/swift.manpages: Remove swauth man pages.

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-16 14:45:33 +0000
+++ debian/changelog	2011-12-23 00:57:25 +0000
@@ -1,3 +1,14 @@
+swift (1.4.5~20111202.1634-0ubuntu3) UNRELEASED; urgency=low
+
+  [ Matthias Klose ]
+  * debian/swift.manpages: Remove swauth man pages.
+
+  [ Adam Gandelman ]
+  * debian/container-server.conf: Add [container-sync] heading required
+    to start container-sync 
+
+ -- Adam Gandelman <[e-mail]>  Thu, 22 Dec 2011 16:48:25 -0800
+
 swift (1.4.5~20111202.1634-0ubuntu2) precise; urgency=low
 
   * Drop swauth man pages. (LP: #900888)

=== modified file 'debian/container-server.conf'
--- debian/container-server.conf	2011-05-08 05:43:32 +0000
+++ debian/container-server.conf	2011-12-23 00:57:25 +0000
@@ -13,3 +13,5 @@
 [container-updater]
 
 [container-auditor]
+
+[container-sync]

=== modified file 'debian/swift.manpages'
--- debian/swift.manpages	2011-07-12 12:35:12 +0000
+++ debian/swift.manpages	2011-12-23 00:57:25 +0000
@@ -1,12 +1,4 @@
 debian/mans/swift/swift.8
-debian/mans/swift/swauth-add-account.8
-debian/mans/swift/swauth-add-user.8
-debian/mans/swift/swauth-cleanup-tokens.8
-debian/mans/swift/swauth-delete-account.8
-debian/mans/swift/swauth-delete-user.8
-debian/mans/swift/swauth-list.8
-debian/mans/swift/swauth-prep.8
-debian/mans/swift/swauth-set-account-service.8
 debian/mans/swift/swift-account-audit.8
 debian/mans/swift/swift-bench.8
 debian/mans/swift/swift-get-nodes.8