Merge lp:~lynxman/ubuntu/precise/swift/swift-proxy-upstart-fix-lp917893 into lp:ubuntu/precise/swift

[Marc Cluet]

  * Changed swift-proxy upstart script to watch /etc/swift/proxy-server.conf
    (LP:#917893)

[Marc Deslauriers (mdeslaur)]

Thanks for the merge request.
Why do you have Chuck in the changelog instead of yourself? Please put yourself in the changelog instead and resubmit.

Thanks!

review: Needs Fixing

[lp:~lynxman/ubuntu/precise/swift/swift-proxy-upstart-fix-lp917893]

26. By Marc Cluet on 2012-01-18

* Fixed changelog

[Marc Cluet (lynxman)]

> Thanks for the merge request.
> Why do you have Chuck in the changelog instead of yourself? Please put
> yourself in the changelog instead and resubmit.
>
> Thanks!

Just fixed that, thanks! :)

[Marc Deslauriers (mdeslaur)]

Could you please remove the "[Marc Cluet]" line from the changelog also? Thanks.

review: Needs Fixing

[lp:~lynxman/ubuntu/precise/swift/swift-proxy-upstart-fix-lp917893]

27. By Marc Cluet on 2012-01-18

* Modified changelog to remove name tag

[Marc Deslauriers (mdeslaur)]

Looks good, ACK. Uploading now.

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-09 11:26:25 +0000
+++ debian/changelog	2012-01-18 16:01:32 +0000
@@ -1,3 +1,10 @@
+swift (1.4.6~20120112.1660-0ubuntu2) precise; urgency=low
+
+  * Changed swift-proxy upstart script to watch /etc/swift/proxy-server.conf
+    (LP:#917893)
+
+ -- Marc Cluet <[e-mail]>  Tue, 17 Jan 2012 17:40:45 -0500
+
 swift (1.4.6~20120112.1660-0ubuntu1) precise; urgency=low
 
   [Chuck Short]

=== modified file 'debian/swift-proxy.upstart.in'
--- debian/swift-proxy.upstart.in	2011-11-18 13:25:16 +0000
+++ debian/swift-proxy.upstart.in	2012-01-18 16:01:32 +0000
@@ -9,7 +9,7 @@
 stop on runlevel [016]
 
 pre-start script
-  if [ -f "/etc/swift/swift-proxy.conf" ]; then
+  if [ -f "/etc/swift/proxy-server.conf" ]; then
     exec /usr/bin/swift-init proxy-server start
   else
     exit 1